lustre: Use long long type to print inode time

Subsequent patches in the series convert inode timestamps
to use struct timespec64 instead of struct timespec as
part of solving the y2038 problem.

Convert these print formats to use long long types to
avoid warnings and errors on conversion.

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
CC: andreas.dilger@intel.com

diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c b/drivers/staging/lustre/lustre/llite/llite_lib.c
index e7500c53fafc84157b8ee2d3f517d94ef0ec6462..9162c557591cd5a1d9177d7a4c6b6f75a4c2cd48 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -1482,8 +1482,9 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr, bool hsm_import)
        }
 
        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",
+                      (unsigned long long)LTIME_S(attr->ia_mtime),
+                      (unsigned long long)LTIME_S(attr->ia_ctime),
                       (s64)ktime_get_real_seconds());
 
        if (S_ISREG(inode->i_mode))
@@ -1760,9 +1761,10 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
        if (body->mbo_valid & OBD_MD_FLMTIME) {
                if (body->mbo_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->mbo_mtime);
+                              "setting ino %lu mtime from %llu to %llu\n",
+                              inode->i_ino,
+                              (unsigned long long)LTIME_S(inode->i_mtime),
+                              (unsigned long long)body->mbo_mtime);
                        LTIME_S(inode->i_mtime) = body->mbo_mtime;
                }
                lli->lli_mtime = body->mbo_mtime;

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index 6c9ec462eb41fe32d9ea143e2bdef7a3f6091f07..c5380c770788ddb6f750c67dc73d487b20e56bbe 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -844,8 +844,9 @@ void ll_update_times(struct ptlrpc_request *request, struct inode *inode)
        LASSERT(body);
        if (body->mbo_valid & OBD_MD_FLMTIME &&
            body->mbo_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->mbo_mtime);
                LTIME_S(inode->i_mtime) = body->mbo_mtime;
        }

diff --git a/drivers/staging/lustre/lustre/lmv/lmv_obd.c b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
index e8a9b9902c37d7132957677bf48d3ee8278b528d..57003be8f4d2e9b5813d707d636a46afc84dcafd 100644 (file)
--- a/drivers/staging/lustre/lustre/lmv/lmv_obd.c
+++ b/drivers/staging/lustre/lustre/lmv/lmv_obd.c
@@ -3031,11 +3031,12 @@ static int lmv_merge_attr(struct obd_export *exp,
        for (i = 0; i < lsm->lsm_md_stripe_count; i++) {
                struct inode *inode = lsm->lsm_md_oinfo[i].lmo_root;
 
-               CDEBUG(D_INFO, "" DFID " size %llu, blocks %llu nlink %u, atime %lu ctime %lu, mtime %lu.\n",
+               CDEBUG(D_INFO, "" DFID " size %llu, blocks %llu nlink %u, atime %llu ctime %llu, mtime %llu.\n",
                       PFID(&lsm->lsm_md_oinfo[i].lmo_fid),
                       i_size_read(inode), (unsigned long long)inode->i_blocks,
-                      inode->i_nlink, LTIME_S(inode->i_atime),
-                      LTIME_S(inode->i_ctime), LTIME_S(inode->i_mtime));
+                      inode->i_nlink, (unsigned long long)LTIME_S(inode->i_atime),
+                      (unsigned long long)LTIME_S(inode->i_ctime),
+                      (unsigned long long)LTIME_S(inode->i_mtime));
 
                /* for slave stripe, it needs to subtract nlink for . and .. */
                if (i)

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index 488b9800755806f9ed703db0f463db8e9a06a9f4..f1ccf8d26ddc5bb735df882b825979206601e440 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -129,9 +129,9 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
        }
 
        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);
 
        ptlrpc_request_set_replen(req);

diff --git a/drivers/staging/lustre/lustre/obdclass/obdo.c b/drivers/staging/lustre/lustre/obdclass/obdo.c
index c4503bc365910c1ebb38ee494677d2c064b0fce4..8f4054aa970bda328f88c8fcb17723c6e8718fba 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obdo.c
+++ b/drivers/staging/lustre/lustre/obdclass/obdo.c
@@ -60,9 +60,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, (long long)LTIME_S(src->i_mtime),
+                      (long long)LTIME_S(src->i_ctime));
 
        if (valid & OBD_MD_FLATIME) {
                dst->o_atime = LTIME_S(src->i_atime);