From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751525AbcFKByD (ORCPT ); Fri, 10 Jun 2016 21:54:03 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:34435 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbcFKBx6 (ORCPT ); Fri, 10 Jun 2016 21:53:58 -0400 Subject: Re: [lustre-devel] [PATCH 11/21] drivers: staging: lustre: Replace CURRENT_TIME with current_fs_time() Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\)) Content-Type: multipart/signed; boundary="Apple-Mail=_56B3CA9A-2EDA-48BA-BD30-B5DB14FD3F2F"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Pgp-Agent: GPGMail 2.6b2 From: Andreas Dilger In-Reply-To: Date: Fri, 10 Jun 2016 19:53:50 -0600 Cc: Deepa Dinamani , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , y2038@lists.linaro.org, Greg Kroah-Hartman , Al Viro , Thomas Gleixner , Linus Torvalds , lustre-devel@lists.lustre.org Message-Id: References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> <1465448705-25055-12-git-send-email-deepa.kernel@gmail.com> To: James Simmons X-Mailer: Apple Mail (2.3124) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Apple-Mail=_56B3CA9A-2EDA-48BA-BD30-B5DB14FD3F2F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On Jun 10, 2016, at 6:36 PM, James Simmons = wrote: >=20 >=20 >> CURRENT_TIME macro is not appropriate for filesystems as it >> doesn't use the right granularity for filesystem timestamps. >> Use current_fs_time() instead. >>=20 >> This is also in preparation for the patch that transitions >> vfs timestamps to use 64 bit time and hence make them >> y2038 safe. As part of the effort current_fs_time() will be >> extended to do range checks. Hence, it is necessary for all >> file system timestamps to use current_fs_time(). >>=20 >> Also change format string for prints so that these are valid >> when vfs is transitioned to use 64 bit timestamps. >=20 > Acked-by: James Simmons Actually, Linus NAK'd the base patch so there isn't any point in this one landing. Cheers, Andreas >> Signed-off-by: Deepa Dinamani >> Cc: Greg Kroah-Hartman >> Cc: lustre-devel@lists.lustre.org >> --- >> drivers/staging/lustre/lustre/llite/llite_lib.c | 17 = +++++++++-------- >> drivers/staging/lustre/lustre/llite/namei.c | 4 ++-- >> drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +++--- >> .../staging/lustre/lustre/obdclass/linux/linux-obdo.c | 6 +++--- >> drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +++--- >> drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- >> 6 files changed, 21 insertions(+), 20 deletions(-) >>=20 >> diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c = b/drivers/staging/lustre/lustre/llite/llite_lib.c >> index 96c7e9f..919748f 100644 >> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c >> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c >> @@ -1219,6 +1219,7 @@ static int ll_setattr_done_writing(struct inode = *inode, >> int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool = hsm_import) >> { >> struct inode *inode =3D d_inode(dentry); >> + struct super_block *sb =3D inode->i_sb; >> struct ll_inode_info *lli =3D ll_i2info(inode); >> struct md_op_data *op_data =3D NULL; >> struct md_open_data *mod =3D NULL; >> @@ -1258,23 +1259,23 @@ int ll_setattr_raw(struct dentry *dentry, = struct iattr *attr, bool hsm_import) >>=20 >> /* We mark all of the fields "set" so MDS/OST does not re-set = them */ >> if (attr->ia_valid & ATTR_CTIME) { >> - attr->ia_ctime =3D CURRENT_TIME; >> + attr->ia_ctime =3D current_fs_time(sb); >> attr->ia_valid |=3D ATTR_CTIME_SET; >> } >> if (!(attr->ia_valid & ATTR_ATIME_SET) && >> (attr->ia_valid & ATTR_ATIME)) { >> - attr->ia_atime =3D CURRENT_TIME; >> + attr->ia_atime =3D current_fs_time(sb); >> attr->ia_valid |=3D ATTR_ATIME_SET; >> } >> if (!(attr->ia_valid & ATTR_MTIME_SET) && >> (attr->ia_valid & ATTR_MTIME)) { >> - attr->ia_mtime =3D CURRENT_TIME; >> + attr->ia_mtime =3D current_fs_time(sb); >> attr->ia_valid |=3D ATTR_MTIME_SET; >> } >>=20 >> if (attr->ia_valid & (ATTR_MTIME | ATTR_CTIME)) >> - CDEBUG(D_INODE, "setting mtime %lu, ctime %lu, now =3D = %llu\n", >> - LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime), >> + CDEBUG(D_INODE, "setting mtime %llu, ctime %llu, now =3D = %llu\n", >> + (long long)LTIME_S(attr->ia_mtime), (long = long)LTIME_S(attr->ia_ctime), >> (s64)ktime_get_real_seconds()); >>=20 >> /* We always do an MDS RPC, even if we're only changing the = size; >> @@ -1564,9 +1565,9 @@ void ll_update_inode(struct inode *inode, = struct lustre_md *md) >> } >> if (body->valid & OBD_MD_FLMTIME) { >> if (body->mtime > LTIME_S(inode->i_mtime)) { >> - CDEBUG(D_INODE, "setting ino %lu mtime from %lu = to %llu\n", >> - inode->i_ino, LTIME_S(inode->i_mtime), >> - body->mtime); >> + CDEBUG(D_INODE, "setting ino %lu mtime from %llu = to %llu\n", >> + inode->i_ino, (unsigned long = long)LTIME_S(inode->i_mtime), >> + (unsigned long long)body->mtime); >> LTIME_S(inode->i_mtime) =3D body->mtime; >> } >> lli->lli_mtime =3D body->mtime; >> diff --git a/drivers/staging/lustre/lustre/llite/namei.c = b/drivers/staging/lustre/lustre/llite/namei.c >> index 5eba0eb..48ed1ce 100644 >> --- a/drivers/staging/lustre/lustre/llite/namei.c >> +++ b/drivers/staging/lustre/lustre/llite/namei.c >> @@ -731,8 +731,8 @@ static void ll_update_times(struct ptlrpc_request = *request, >> LASSERT(body); >> if (body->valid & OBD_MD_FLMTIME && >> body->mtime > LTIME_S(inode->i_mtime)) { >> - CDEBUG(D_INODE, "setting fid "DFID" mtime from %lu to = %llu\n", >> - PFID(ll_inode2fid(inode)), = LTIME_S(inode->i_mtime), >> + CDEBUG(D_INODE, "setting fid "DFID" mtime from %llu to = %llu\n", >> + PFID(ll_inode2fid(inode)), (unsigned long = long)LTIME_S(inode->i_mtime), >> body->mtime); >> LTIME_S(inode->i_mtime) =3D body->mtime; >> } >> diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c = b/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> index 4ef3db1..9980f3a 100644 >> --- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> +++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> @@ -143,9 +143,9 @@ int mdc_setattr(struct obd_export *exp, struct = md_op_data *op_data, >> rpc_lock =3D obd->u.cli.cl_rpc_lock; >>=20 >> if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME)) >> - CDEBUG(D_INODE, "setting mtime %ld, ctime %ld\n", >> - LTIME_S(op_data->op_attr.ia_mtime), >> - LTIME_S(op_data->op_attr.ia_ctime)); >> + CDEBUG(D_INODE, "setting mtime %lld, ctime %lld\n", >> + (long long)LTIME_S(op_data->op_attr.ia_mtime), >> + (long long)LTIME_S(op_data->op_attr.ia_ctime)); >> mdc_setattr_pack(req, op_data, ea, ealen, ea2, ea2len); >>=20 >> ptlrpc_request_set_replen(req); >> diff --git = a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c = b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> index b41b65e..ccd2b7b 100644 >> --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> @@ -54,9 +54,9 @@ void obdo_refresh_inode(struct inode *dst, struct = obdo *src, u32 valid) >>=20 >> if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME)) >> CDEBUG(D_INODE, >> - "valid %#llx, cur time %lu/%lu, new %llu/%llu\n", >> - src->o_valid, LTIME_S(dst->i_mtime), >> - LTIME_S(dst->i_ctime), src->o_mtime, = src->o_ctime); >> + "valid %#llx, cur time %llu/%llu, new = %llu/%llu\n", >> + src->o_valid, (unsigned long = long)LTIME_S(dst->i_mtime), >> + (unsigned long long)LTIME_S(dst->i_ctime), = src->o_mtime, src->o_ctime); >>=20 >> if (valid & OBD_MD_FLATIME && src->o_atime > = LTIME_S(dst->i_atime)) >> LTIME_S(dst->i_atime) =3D src->o_atime; >> diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c = b/drivers/staging/lustre/lustre/obdclass/obdo.c >> index 748e33f..973fa4c 100644 >> --- a/drivers/staging/lustre/lustre/obdclass/obdo.c >> +++ b/drivers/staging/lustre/lustre/obdclass/obdo.c >> @@ -62,9 +62,9 @@ void obdo_from_inode(struct obdo *dst, struct inode = *src, u32 valid) >> u32 newvalid =3D 0; >>=20 >> if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME)) >> - CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n", >> - valid, LTIME_S(src->i_mtime), >> - LTIME_S(src->i_ctime)); >> + CDEBUG(D_INODE, "valid %x, new time %llu/%llu\n", >> + valid, (unsigned long long)LTIME_S(src->i_mtime), >> + (unsigned long long)LTIME_S(src->i_ctime)); >>=20 >> if (valid & OBD_MD_FLATIME) { >> dst->o_atime =3D LTIME_S(src->i_atime); >> diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c = b/drivers/staging/lustre/lustre/osc/osc_io.c >> index d534b0e..99f69bb 100644 >> --- a/drivers/staging/lustre/lustre/osc/osc_io.c >> +++ b/drivers/staging/lustre/lustre/osc/osc_io.c >> @@ -221,7 +221,7 @@ static void osc_page_touch_at(const struct lu_env = *env, >> kms > loi->loi_kms ? "" : "not ", loi->loi_kms, kms, >> loi->loi_lvb.lvb_size); >>=20 >> - attr->cat_mtime =3D attr->cat_ctime =3D LTIME_S(CURRENT_TIME); >> + attr->cat_mtime =3D attr->cat_ctime =3D = ktime_get_real_seconds(); >> valid =3D CAT_MTIME | CAT_CTIME; >> if (kms > loi->loi_kms) { >> attr->cat_kms =3D kms; >> -- >> 1.9.1 >>=20 >> _______________________________________________ >> lustre-devel mailing list >> lustre-devel@lists.lustre.org >> http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org >>=20 > -- > To unsubscribe from this list: send the line "unsubscribe = linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Cheers, Andreas --Apple-Mail=_56B3CA9A-2EDA-48BA-BD30-B5DB14FD3F2F Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP using GPGMail -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org iQIVAwUBV1tvL3Kl2rkXzB/gAQidmRAAuudNclXZJbaFAMmPVrIfoRKsCnTTYf57 f+fsO4AlbfoeKSIywpwElvuaCjuYZkwvD8n/aFj0BIkBqD3ryz7/gUXPlpWtvFpZ Cqz5Tr9Ks3snYIiBsinmBUPyCme8VY1Ge6SoVDmDD5Igw/Cb7Oi3RgEGCidk4B3P wh9NS9QCShsMa48wrHkWbL+XlILSj1gXIY87T4RBrwTQf3HeDNHDck5hq2DrTNBd SKED4MQ+IrqLOnvkBOX2senUKZCAuVRUmpsn8KnQlvSRVOWutq3lauZWDeHIhlfR W86O2n7D/xtRGwC00Tiz5yG/N0nliy/pgWkrYthU11LikintVh8BrPFLV3jDSNb+ OZ6dsGNoWgMoCdQUPgg5h1AsMQzddsNTd9mHFHVDtQJmEWTlU6svxjANm2XDfMZR rhcHArHNSjSEqoF88Rpc3+GGcyZRmE16O5P1Doto6R4Wx4+4CUQvAwwhwb+D0bM2 ARRG2J5ZbkprNuaAGfU5krcgaq/Sjs0hYmYD9AgZvh45SPGzpKSPhHwwF197hHrw g/+ff4VZba9ihi8/r31rVjiBn22V0VY7qEhCe4iCbFsx70Hf8nnemi5jadI0K3ME UsitL8rp5MzlHnVftwVKMiWgZm5nJNMZP6mO7JXa+6AhyOVKfiOBTCZDVklpjrPU 4tnH6cVij5Q= =W/5d -----END PGP SIGNATURE----- --Apple-Mail=_56B3CA9A-2EDA-48BA-BD30-B5DB14FD3F2F-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Dilger Date: Fri, 10 Jun 2016 19:53:50 -0600 Subject: [lustre-devel] [PATCH 11/21] drivers: staging: lustre: Replace CURRENT_TIME with current_fs_time() In-Reply-To: References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> <1465448705-25055-12-git-send-email-deepa.kernel@gmail.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: James Simmons Cc: Deepa Dinamani , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , y2038@lists.linaro.org, Greg Kroah-Hartman , Al Viro , Thomas Gleixner , Linus Torvalds , lustre-devel@lists.lustre.org On Jun 10, 2016, at 6:36 PM, James Simmons wrote: > > >> CURRENT_TIME macro is not appropriate for filesystems as it >> doesn't use the right granularity for filesystem timestamps. >> Use current_fs_time() instead. >> >> This is also in preparation for the patch that transitions >> vfs timestamps to use 64 bit time and hence make them >> y2038 safe. As part of the effort current_fs_time() will be >> extended to do range checks. Hence, it is necessary for all >> file system timestamps to use current_fs_time(). >> >> Also change format string for prints so that these are valid >> when vfs is transitioned to use 64 bit timestamps. > > Acked-by: James Simmons Actually, Linus NAK'd the base patch so there isn't any point in this one landing. Cheers, Andreas >> Signed-off-by: Deepa Dinamani >> Cc: Greg Kroah-Hartman >> Cc: lustre-devel at lists.lustre.org >> --- >> drivers/staging/lustre/lustre/llite/llite_lib.c | 17 +++++++++-------- >> drivers/staging/lustre/lustre/llite/namei.c | 4 ++-- >> drivers/staging/lustre/lustre/mdc/mdc_reint.c | 6 +++--- >> .../staging/lustre/lustre/obdclass/linux/linux-obdo.c | 6 +++--- >> drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +++--- >> drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- >> 6 files changed, 21 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c >> index 96c7e9f..919748f 100644 >> --- a/drivers/staging/lustre/lustre/llite/llite_lib.c >> +++ b/drivers/staging/lustre/lustre/llite/llite_lib.c >> @@ -1219,6 +1219,7 @@ static int ll_setattr_done_writing(struct inode *inode, >> int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) >> { >> struct inode *inode = d_inode(dentry); >> + struct super_block *sb = inode->i_sb; >> struct ll_inode_info *lli = ll_i2info(inode); >> struct md_op_data *op_data = NULL; >> struct md_open_data *mod = NULL; >> @@ -1258,23 +1259,23 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import) >> >> /* We mark all of the fields "set" so MDS/OST does not re-set them */ >> if (attr->ia_valid & ATTR_CTIME) { >> - attr->ia_ctime = CURRENT_TIME; >> + attr->ia_ctime = current_fs_time(sb); >> attr->ia_valid |= ATTR_CTIME_SET; >> } >> if (!(attr->ia_valid & ATTR_ATIME_SET) && >> (attr->ia_valid & ATTR_ATIME)) { >> - attr->ia_atime = CURRENT_TIME; >> + attr->ia_atime = current_fs_time(sb); >> attr->ia_valid |= ATTR_ATIME_SET; >> } >> if (!(attr->ia_valid & ATTR_MTIME_SET) && >> (attr->ia_valid & ATTR_MTIME)) { >> - attr->ia_mtime = CURRENT_TIME; >> + attr->ia_mtime = current_fs_time(sb); >> attr->ia_valid |= ATTR_MTIME_SET; >> } >> >> if (attr->ia_valid & (ATTR_MTIME | ATTR_CTIME)) >> - CDEBUG(D_INODE, "setting mtime %lu, ctime %lu, now = %llu\n", >> - LTIME_S(attr->ia_mtime), LTIME_S(attr->ia_ctime), >> + CDEBUG(D_INODE, "setting mtime %llu, ctime %llu, now = %llu\n", >> + (long long)LTIME_S(attr->ia_mtime), (long long)LTIME_S(attr->ia_ctime), >> (s64)ktime_get_real_seconds()); >> >> /* We always do an MDS RPC, even if we're only changing the size; >> @@ -1564,9 +1565,9 @@ void ll_update_inode(struct inode *inode, struct lustre_md *md) >> } >> if (body->valid & OBD_MD_FLMTIME) { >> if (body->mtime > LTIME_S(inode->i_mtime)) { >> - CDEBUG(D_INODE, "setting ino %lu mtime from %lu to %llu\n", >> - inode->i_ino, LTIME_S(inode->i_mtime), >> - body->mtime); >> + CDEBUG(D_INODE, "setting ino %lu mtime from %llu to %llu\n", >> + inode->i_ino, (unsigned long long)LTIME_S(inode->i_mtime), >> + (unsigned long long)body->mtime); >> LTIME_S(inode->i_mtime) = body->mtime; >> } >> lli->lli_mtime = body->mtime; >> diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c >> index 5eba0eb..48ed1ce 100644 >> --- a/drivers/staging/lustre/lustre/llite/namei.c >> +++ b/drivers/staging/lustre/lustre/llite/namei.c >> @@ -731,8 +731,8 @@ static void ll_update_times(struct ptlrpc_request *request, >> LASSERT(body); >> if (body->valid & OBD_MD_FLMTIME && >> body->mtime > LTIME_S(inode->i_mtime)) { >> - CDEBUG(D_INODE, "setting fid "DFID" mtime from %lu to %llu\n", >> - PFID(ll_inode2fid(inode)), LTIME_S(inode->i_mtime), >> + CDEBUG(D_INODE, "setting fid "DFID" mtime from %llu to %llu\n", >> + PFID(ll_inode2fid(inode)), (unsigned long long)LTIME_S(inode->i_mtime), >> body->mtime); >> LTIME_S(inode->i_mtime) = body->mtime; >> } >> diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> index 4ef3db1..9980f3a 100644 >> --- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> +++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c >> @@ -143,9 +143,9 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, >> rpc_lock = obd->u.cli.cl_rpc_lock; >> >> if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME)) >> - CDEBUG(D_INODE, "setting mtime %ld, ctime %ld\n", >> - LTIME_S(op_data->op_attr.ia_mtime), >> - LTIME_S(op_data->op_attr.ia_ctime)); >> + CDEBUG(D_INODE, "setting mtime %lld, ctime %lld\n", >> + (long long)LTIME_S(op_data->op_attr.ia_mtime), >> + (long long)LTIME_S(op_data->op_attr.ia_ctime)); >> mdc_setattr_pack(req, op_data, ea, ealen, ea2, ea2len); >> >> ptlrpc_request_set_replen(req); >> diff --git a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> index b41b65e..ccd2b7b 100644 >> --- a/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> +++ b/drivers/staging/lustre/lustre/obdclass/linux/linux-obdo.c >> @@ -54,9 +54,9 @@ void obdo_refresh_inode(struct inode *dst, struct obdo *src, u32 valid) >> >> if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME)) >> CDEBUG(D_INODE, >> - "valid %#llx, cur time %lu/%lu, new %llu/%llu\n", >> - src->o_valid, LTIME_S(dst->i_mtime), >> - LTIME_S(dst->i_ctime), src->o_mtime, src->o_ctime); >> + "valid %#llx, cur time %llu/%llu, new %llu/%llu\n", >> + src->o_valid, (unsigned long long)LTIME_S(dst->i_mtime), >> + (unsigned long long)LTIME_S(dst->i_ctime), src->o_mtime, src->o_ctime); >> >> if (valid & OBD_MD_FLATIME && src->o_atime > LTIME_S(dst->i_atime)) >> LTIME_S(dst->i_atime) = src->o_atime; >> diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c >> index 748e33f..973fa4c 100644 >> --- a/drivers/staging/lustre/lustre/obdclass/obdo.c >> +++ b/drivers/staging/lustre/lustre/obdclass/obdo.c >> @@ -62,9 +62,9 @@ void obdo_from_inode(struct obdo *dst, struct inode *src, u32 valid) >> u32 newvalid = 0; >> >> if (valid & (OBD_MD_FLCTIME | OBD_MD_FLMTIME)) >> - CDEBUG(D_INODE, "valid %x, new time %lu/%lu\n", >> - valid, LTIME_S(src->i_mtime), >> - LTIME_S(src->i_ctime)); >> + CDEBUG(D_INODE, "valid %x, new time %llu/%llu\n", >> + valid, (unsigned long long)LTIME_S(src->i_mtime), >> + (unsigned long long)LTIME_S(src->i_ctime)); >> >> if (valid & OBD_MD_FLATIME) { >> dst->o_atime = LTIME_S(src->i_atime); >> diff --git a/drivers/staging/lustre/lustre/osc/osc_io.c b/drivers/staging/lustre/lustre/osc/osc_io.c >> index d534b0e..99f69bb 100644 >> --- a/drivers/staging/lustre/lustre/osc/osc_io.c >> +++ b/drivers/staging/lustre/lustre/osc/osc_io.c >> @@ -221,7 +221,7 @@ static void osc_page_touch_at(const struct lu_env *env, >> kms > loi->loi_kms ? "" : "not ", loi->loi_kms, kms, >> loi->loi_lvb.lvb_size); >> >> - attr->cat_mtime = attr->cat_ctime = LTIME_S(CURRENT_TIME); >> + attr->cat_mtime = attr->cat_ctime = ktime_get_real_seconds(); >> valid = CAT_MTIME | CAT_CTIME; >> if (kms > loi->loi_kms) { >> attr->cat_kms = kms; >> -- >> 1.9.1 >> >> _______________________________________________ >> lustre-devel mailing list >> lustre-devel at lists.lustre.org >> http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Cheers, Andreas -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: Message signed with OpenPGP using GPGMail URL: