LU-6142 llite: remove lti_iter field

[fs/lustre-release.git] / lustre / llite / llite_internal.h

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 9ac3f5d..aaa55b7 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -143,9 +143,6 @@ struct ll_inode_info {
        union {
                /* for directory */
                struct {
-                       /* serialize normal readdir and statahead-readdir. */
-                       struct mutex                    lli_readdir_mutex;
-
                        /* metadata statahead */
                        /* since parent-child threads can share the same @file
                         * struct, "opendir_key" is the token when dir close for
@@ -214,6 +211,9 @@ struct ll_inode_info {
                        struct mutex             lli_pcc_lock;
                        enum lu_pcc_state_flags  lli_pcc_state;
                        struct pcc_inode        *lli_pcc_inode;
+                       struct mutex                    lli_group_mutex;
+                       __u64                           lli_group_users;
+                       unsigned long                   lli_group_gid;
                };
        };
 
@@ -539,8 +539,7 @@ struct ll_sb_info {
        struct lu_fid            ll_root_fid; /* root object fid */
 
         int                       ll_flags;
-       unsigned int              ll_umounting:1,
-                                 ll_xattr_cache_enabled:1,
+       unsigned int              ll_xattr_cache_enabled:1,
                                  ll_xattr_cache_set:1, /* already set to 0/1 */
                                  ll_client_common_fill_super_succeeded:1,
                                  ll_checksum_set:1;
@@ -1092,7 +1091,6 @@ struct ll_cl_context {
 };
 
 struct ll_thread_info {
-       struct iov_iter         lti_iter;
        struct vvp_io_args      lti_args;
        struct ra_io_arg        lti_ria;
        struct ll_cl_context    lti_io_ctx;