LU-6245 libcfs: Remove kp30.h

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

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 5674ca4..6bf0865 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -42,6 +42,7 @@
 
 #include <linux/module.h>
 #include <linux/statfs.h>
+#include <linux/time.h>
 #include <linux/types.h>
 #include <linux/version.h>
 #include <linux/mm.h>
@@ -1621,17 +1622,17 @@ 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_SET) &&
            (attr->ia_valid & ATTR_CTIME)) {
-                attr->ia_ctime = CFS_CURRENT_TIME;
+               attr->ia_ctime = CURRENT_TIME;
                 attr->ia_valid |= ATTR_CTIME_SET;
         }
        if (!(attr->ia_valid & ATTR_ATIME_SET) &&
            (attr->ia_valid & ATTR_ATIME)) {
-                attr->ia_atime = CFS_CURRENT_TIME;
+               attr->ia_atime = CURRENT_TIME;
                 attr->ia_valid |= ATTR_ATIME_SET;
         }
        if (!(attr->ia_valid & ATTR_MTIME_SET) &&
            (attr->ia_valid & ATTR_MTIME)) {
-                attr->ia_mtime = CFS_CURRENT_TIME;
+               attr->ia_mtime = CURRENT_TIME;
                 attr->ia_valid |= ATTR_MTIME_SET;
         }
 
@@ -2341,11 +2342,11 @@ int ll_prep_inode(struct inode **inode, struct ptlrpc_request *req,
         * 2. layout was changed by another client
         * 3. proc2: refresh layout and layout lock granted
         * 4. proc1: to apply a stale layout */
-       if (it != NULL && it->d.lustre.it_lock_mode != 0) {
+       if (it != NULL && it->it_lock_mode != 0) {
                struct lustre_handle lockh;
                struct ldlm_lock *lock;
 
-               lockh.cookie = it->d.lustre.it_lock_handle;
+               lockh.cookie = it->it_lock_handle;
                lock = ldlm_handle2lock(&lockh);
                LASSERT(lock != NULL);
                if (ldlm_has_layout(lock)) {