b=21551 holding ->lli_size_sem to update inode size

[fs/lustre-release.git] / lustre / liblustre / llite_lib.h

diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h
index bf51702..44f1663 100644 (file)
--- a/lustre/liblustre/llite_lib.h
+++ b/lustre/liblustre/llite_lib.h
@@ -68,7 +68,7 @@ struct llu_sb_info {
         struct lu_fid            ll_root_fid;
         int                      ll_flags;
         struct lustre_client_ocd ll_lco;
-        struct list_head         ll_conn_chain;
+        cfs_list_t               ll_conn_chain;
 
         struct obd_uuid          ll_mds_uuid;
         struct obd_uuid          ll_mds_peer_uuid;
@@ -90,7 +90,7 @@ struct llu_inode_info {
 
         struct lov_stripe_md   *lli_smd;
         char                   *lli_symlink_name;
-        struct semaphore        lli_open_sem;
+        cfs_semaphore_t         lli_open_sem;
         __u64                   lli_maxbytes;
         unsigned long           lli_flags;
         __u64                   lli_ioepoch;
@@ -383,9 +383,9 @@ static inline struct slp_io *slp_env_io(const struct lu_env *env)
 #define cl_i2info(info) llu_i2info(info)
 #define cl_inode_mode(inode) (llu_i2stat(inode)->st_mode)
 #define cl_i2sbi llu_i2sbi
-#define cl_isize_read(inode) (llu_i2stat(inode)->st_size)
-#define cl_isize_write(inode,kms) do{llu_i2stat(inode)->st_size = kms;}while(0)
-#define cl_isize_write_nolock(inode,kms) do{llu_i2stat(inode)->st_size = kms;}while(0)
+#define cl_isize_read(inode)             (llu_i2stat(inode)->st_size)
+#define cl_isize_write(inode,kms)        do{llu_i2stat(inode)->st_size = kms;}while(0)
+#define cl_isize_write_nolock(inode,kms) cl_isize_write(inode,kms)
 
 static inline void cl_isize_lock(struct inode *inode, int lsmlock)
 {