LU-2675 llite: remove lli_lvb

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

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index bfc14a9..09aa53c 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -791,7 +791,7 @@ void ll_kill_super(struct super_block *sb)
                /* wait running statahead threads to quit */
                while (atomic_read(&sbi->ll_sa_running) > 0)
                        schedule_timeout_and_set_state(TASK_UNINTERRUPTIBLE,
-                                                       HZ >> 3);
+                               msecs_to_jiffies(MSEC_PER_SEC >> 3));
        }
 
        EXIT;
@@ -849,23 +849,6 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 6, 53, 0)
-               tmp = ll_set_opt("acl", s1, LL_SBI_ACL);
-               if (tmp) {
-                       /* Ignore deprecated mount option.  The client will
-                        * always try to mount with ACL support, whether this
-                        * is used depends on whether server supports it. */
-                       LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
-                                                 "mount option 'acl'.\n");
-                       goto next;
-               }
-               tmp = ll_set_opt("noacl", s1, LL_SBI_ACL);
-               if (tmp) {
-                       LCONSOLE_ERROR_MSG(0x152, "Ignoring deprecated "
-                                                 "mount option 'noacl'.\n");
-                       goto next;
-               }
-#endif
                tmp = ll_set_opt("remote_client", s1, LL_SBI_RMT_CLIENT);
                if (tmp) {
                        *flags |= tmp;
@@ -1494,8 +1477,8 @@ void ll_clear_inode(struct inode *inode)
        EXIT;
 }
 
-int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
-                  struct md_open_data **mod)
+static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data,
+                        struct md_open_data **mod)
 {
         struct lustre_md md;
         struct inode *inode = dentry->d_inode;
@@ -1975,7 +1958,7 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
        if (body->mbo_valid & OBD_MD_FLATIME) {
                if (body->mbo_atime > LTIME_S(inode->i_atime))
                        LTIME_S(inode->i_atime) = body->mbo_atime;
-               lli->lli_lvb.lvb_atime = body->mbo_atime;
+               lli->lli_atime = body->mbo_atime;
        }
 
        if (body->mbo_valid & OBD_MD_FLMTIME) {
@@ -1985,13 +1968,13 @@ int ll_update_inode(struct inode *inode, struct lustre_md *md)
                               LTIME_S(inode->i_mtime), body->mbo_mtime);
                        LTIME_S(inode->i_mtime) = body->mbo_mtime;
                }
-               lli->lli_lvb.lvb_mtime = body->mbo_mtime;
+               lli->lli_mtime = body->mbo_mtime;
        }
 
        if (body->mbo_valid & OBD_MD_FLCTIME) {
                if (body->mbo_ctime > LTIME_S(inode->i_ctime))
                        LTIME_S(inode->i_ctime) = body->mbo_ctime;
-               lli->lli_lvb.lvb_ctime = body->mbo_ctime;
+               lli->lli_ctime = body->mbo_ctime;
        }
 
        if (body->mbo_valid & OBD_MD_FLMODE)
@@ -2231,7 +2214,7 @@ int ll_iocontrol(struct inode *inode, struct file *file,
                 if (IS_ERR(op_data))
                         RETURN(PTR_ERR(op_data));
 
-                ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags = flags;
+               op_data->op_attr_flags = flags;
                 op_data->op_attr.ia_valid |= ATTR_ATTR_FLAG;
                 rc = md_setattr(sbi->ll_md_exp, op_data,
                                 NULL, 0, NULL, 0, &req, NULL);
@@ -2527,9 +2510,9 @@ int ll_process_config(struct lustre_cfg *lcfg)
 
 /* this function prepares md_op_data hint for passing ot down to MD stack. */
 struct md_op_data * ll_prep_md_op_data(struct md_op_data *op_data,
-                                       struct inode *i1, struct inode *i2,
-                                       const char *name, int namelen,
-                                       int mode, __u32 opc, void *data)
+                                      struct inode *i1, struct inode *i2,
+                                      const char *name, size_t namelen,
+                                      __u32 mode, __u32 opc, void *data)
 {
         LASSERT(i1 != NULL);