LU-11838 lustre: discard LTIME_S macro

[fs/lustre-release.git] / lustre / llite / vvp_object.c

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index b7fb1d3..c3bf715 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -185,9 +185,9 @@ static int vvp_object_glimpse(const struct lu_env *env,
        struct inode *inode = vvp_object_inode(obj);
 
        ENTRY;
-       lvb->lvb_mtime = LTIME_S(inode->i_mtime);
-       lvb->lvb_atime = LTIME_S(inode->i_atime);
-       lvb->lvb_ctime = LTIME_S(inode->i_ctime);
+       lvb->lvb_mtime = inode->i_mtime.tv_sec;
+       lvb->lvb_atime = inode->i_atime.tv_sec;
+       lvb->lvb_ctime = inode->i_ctime.tv_sec;
 
        /*
         * LU-417: Add dirty pages block count lest i_blocks reports 0, some
@@ -205,21 +205,21 @@ static void vvp_req_attr_set(const struct lu_env *env, struct cl_object *obj,
 {
        struct inode *inode;
        struct obdo  *oa;
-       u64 valid_flags = OBD_MD_FLTYPE;
+       u64 valid_flags = OBD_MD_FLTYPE | OBD_MD_FLUID | OBD_MD_FLGID;
 
        oa = attr->cra_oa;
        inode = vvp_object_inode(obj);
 
        if (attr->cra_type == CRT_WRITE) {
-               valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME |
-                              OBD_MD_FLUID | OBD_MD_FLGID;
+               valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
                obdo_set_o_projid(oa, ll_i2info(inode)->lli_projid);
        }
        obdo_from_inode(oa, inode, valid_flags & attr->cra_flags);
        obdo_set_parent_fid(oa, &ll_i2info(inode)->lli_fid);
        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
                oa->o_parent_oid++;
-       memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid, LUSTRE_JOBID_SIZE);
+       memcpy(attr->cra_jobid, ll_i2info(inode)->lli_jobid,
+              sizeof(attr->cra_jobid));
 }
 
 static const struct cl_object_operations vvp_ops = {