LU-12355 llite: include file linux/selinux.h removed

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

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index c4b6cc9..bc4c30a 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -85,9 +85,9 @@ int cl_setattr_ost(struct cl_object *obj, const struct iattr *attr,
        io->ci_obj = obj;
        io->ci_verify_layout = 1;
 
-       io->u.ci_setattr.sa_attr.lvb_atime = LTIME_S(attr->ia_atime);
-       io->u.ci_setattr.sa_attr.lvb_mtime = LTIME_S(attr->ia_mtime);
-       io->u.ci_setattr.sa_attr.lvb_ctime = LTIME_S(attr->ia_ctime);
+       io->u.ci_setattr.sa_attr.lvb_atime = attr->ia_atime.tv_sec;
+       io->u.ci_setattr.sa_attr.lvb_mtime = attr->ia_mtime.tv_sec;
+       io->u.ci_setattr.sa_attr.lvb_ctime = attr->ia_ctime.tv_sec;
        io->u.ci_setattr.sa_attr.lvb_size = attr->ia_size;
        io->u.ci_setattr.sa_attr_flags = attr_flags;
        io->u.ci_setattr.sa_avalid = attr->ia_valid;
@@ -164,8 +164,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
                if (!(inode->i_state & I_NEW)) {
                        result = -EIO;
                        CERROR("%s: unexpected not-NEW inode "DFID": rc = %d\n",
-                              ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid),
-                              result);
+                              ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
                        goto out;
                }
 
@@ -192,7 +191,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
 
        if (result != 0)
                CERROR("%s: failed to initialize cl_object "DFID": rc = %d\n",
-                       ll_get_fsname(inode->i_sb, NULL, 0), PFID(fid), result);
+                      ll_i2sbi(inode)->ll_fsname, PFID(fid), result);
 
 out:
        cl_env_put(env, &refcheck);