These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / lustre / llite / vvp_object.c

diff --git a/kernel/drivers/staging/lustre/lustre/llite/vvp_object.c b/kernel/drivers/staging/lustre/lustre/llite/vvp_object.c
index b6f6d4c..e13afb7 100644 (file)
--- a/kernel/drivers/staging/lustre/lustre/llite/vvp_object.c
+++ b/kernel/drivers/staging/lustre/lustre/llite/vvp_object.c
@@ -40,7 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
-
 #include "../../include/linux/libcfs/libcfs.h"
 
 #include "../include/obd.h"
@@ -87,9 +86,9 @@ static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
         */
 
        attr->cat_size = i_size_read(inode);
-       attr->cat_mtime = LTIME_S(inode->i_mtime);
-       attr->cat_atime = LTIME_S(inode->i_atime);
-       attr->cat_ctime = LTIME_S(inode->i_ctime);
+       attr->cat_mtime = inode->i_mtime.tv_sec;
+       attr->cat_atime = inode->i_atime.tv_sec;
+       attr->cat_ctime = inode->i_ctime.tv_sec;
        attr->cat_blocks = inode->i_blocks;
        attr->cat_uid = from_kuid(&init_user_ns, inode->i_uid);
        attr->cat_gid = from_kgid(&init_user_ns, inode->i_gid);
@@ -107,11 +106,11 @@ static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
        if (valid & CAT_GID)
                inode->i_gid = make_kgid(&init_user_ns, attr->cat_gid);
        if (valid & CAT_ATIME)
-               LTIME_S(inode->i_atime) = attr->cat_atime;
+               inode->i_atime.tv_sec = attr->cat_atime;
        if (valid & CAT_MTIME)
-               LTIME_S(inode->i_mtime) = attr->cat_mtime;
+               inode->i_mtime.tv_sec = attr->cat_mtime;
        if (valid & CAT_CTIME)
-               LTIME_S(inode->i_ctime) = attr->cat_ctime;
+               inode->i_ctime.tv_sec = attr->cat_ctime;
        if (0 && valid & CAT_SIZE)
                cl_isize_write_nolock(inode, attr->cat_size);
        /* not currently necessary */