LU-2675 llite: remove lli_lvb

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

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 6fae11a..2ce7639 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -173,7 +173,9 @@ struct ll_inode_info {
        struct inode                    lli_vfs_inode;
 
        /* the most recent timestamps obtained from mds */
-       struct ost_lvb                  lli_lvb;
+       obd_time                        lli_atime;
+       obd_time                        lli_mtime;
+       obd_time                        lli_ctime;
        spinlock_t                      lli_agl_lock;
 
        /* Try to make the d::member and f::member are aligned. Before using
@@ -426,7 +428,7 @@ enum stats_track_type {
        "nolck",        \
        "checksum",     \
        "flock",        \
-       "xattr",        \
+       "user_xattr",   \
        "acl",          \
        "???",          \
        "rmt_client",   \
@@ -442,7 +444,7 @@ enum stats_track_type {
        "verbose",      \
        "layout",       \
        "user_fid2path",\
-       "xattr",        \
+       "xattr_cache",  \
        "norootsquash", \
 }
 
@@ -882,7 +884,7 @@ int ll_fsync(struct file *file, int data);
 #else
 int ll_fsync(struct file *file, struct dentry *dentry, int data);
 #endif
-int ll_merge_lvb(const struct lu_env *env, struct inode *inode);
+int ll_merge_attr(const struct lu_env *env, struct inode *inode);
 int ll_fid2path(struct inode *inode, void __user *arg);
 int ll_data_version(struct inode *inode, __u64 *data_version, int flags);
 int ll_hsm_release(struct inode *inode);
@@ -1081,9 +1083,10 @@ struct vvp_thread_info {
         struct ll_cl_context vti_io_ctx;
 };
 
+extern struct lu_context_key vvp_key;
+
 static inline struct vvp_thread_info *vvp_env_info(const struct lu_env *env)
 {
-        extern struct lu_context_key vvp_key;
         struct vvp_thread_info      *info;
 
         info = lu_context_key_get(&env->le_ctx, &vvp_key);
@@ -1105,9 +1108,10 @@ struct vvp_session {
         struct vvp_io         vs_ios;
 };
 
+extern struct lu_context_key vvp_session_key;
+
 static inline struct vvp_session *vvp_env_session(const struct lu_env *env)
 {
-        extern struct lu_context_key vvp_session_key;
         struct vvp_session *ses;
 
         ses = lu_context_key_get(env->le_ses, &vvp_session_key);
@@ -1469,11 +1473,6 @@ static inline void cl_isize_write(struct inode *inode, loff_t kms)
 
 #define cl_isize_read(inode)             i_size_read(inode)
 
-static inline int cl_merge_lvb(const struct lu_env *env, struct inode *inode)
-{
-       return ll_merge_lvb(env, inode);
-}
-
 #define cl_inode_atime(inode) LTIME_S((inode)->i_atime)
 #define cl_inode_ctime(inode) LTIME_S((inode)->i_ctime)
 #define cl_inode_mtime(inode) LTIME_S((inode)->i_mtime)