b=19427 correct lmm_object_id and reserve fids for fid-on-OST.

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

diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h
index afe017c..5fd0dc4 100644 (file)
--- a/lustre/liblustre/llite_lib.h
+++ b/lustre/liblustre/llite_lib.h
@@ -36,6 +36,18 @@
 
 #ifndef __LLU_H_
 #define __LLU_H_
+#include <fcntl.h>
+#include <sys/queue.h>
+#include <sysio.h>
+#ifdef HAVE_XTIO_H
+#include <xtio.h>
+#endif
+#include <fs.h>
+#include <mount.h>
+#include <inode.h>
+#ifdef HAVE_FILE_H
+#include <file.h>
+#endif
 
 #include <liblustre.h>
 #include <obd.h>
@@ -54,7 +66,6 @@
 /* This should not be "optimized" use ~0ULL because page->index is a long and
  * 32-bit systems are therefore limited to 16TB in a mapping */
 #define PAGE_CACHE_MAXBYTES ((__u64)(~0UL) << CFS_PAGE_SHIFT)
-
 struct ll_file_data {
         struct obd_client_handle fd_mds_och;
         __u32 fd_flags;
@@ -68,7 +79,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 +101,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;
@@ -115,9 +126,10 @@ struct llu_inode_info {
         int                     lli_st_flags;
         unsigned long           lli_st_generation;
         struct cl_object       *lli_clob;
+        /* the most recent timestamps obtained from mds */
+        struct ost_lvb          lli_lvb;
 };
 
-
 static inline struct llu_sb_info *llu_fs2sbi(struct filesys *fs)
 {
         return (struct llu_sb_info*)(fs->fs_private);
@@ -128,11 +140,18 @@ static inline struct llu_inode_info *llu_i2info(struct inode *inode)
         return (struct llu_inode_info*)(inode->i_private);
 }
 
+static inline int ll_inode_flags(struct inode *inode)
+{
+        return llu_i2info(inode)->lli_st_flags;
+}
+
 static inline struct intnl_stat *llu_i2stat(struct inode *inode)
 {
         return &inode->i_stbuf;
 }
 
+#define ll_inode_blksize(inode)     (llu_i2stat(inode)->st_blksize)
+
 static inline struct llu_sb_info *llu_i2sbi(struct inode *inode)
 {
         return llu_i2info(inode)->lli_sbi;
@@ -227,10 +246,10 @@ extern struct mount_option_s mount_option;
 /* super.c */
 void llu_update_inode(struct inode *inode, struct lustre_md *md);
 void obdo_to_inode(struct inode *dst, struct obdo *src, obd_flag valid);
-void obdo_from_inode(struct obdo *dst, struct inode *src, obd_flag valid);
 int ll_it_open_error(int phase, struct lookup_intent *it);
 struct inode *llu_iget(struct filesys *fs, struct lustre_md *md);
-int llu_inode_getattr(struct inode *inode, struct obdo *obdo);
+int llu_inode_getattr(struct inode *inode, struct obdo *obdo,
+                      __u64 ioepoch, int sync);
 int llu_md_setattr(struct inode *inode, struct md_op_data *op_data,
                    struct md_open_data **mod);
 int llu_setattr_raw(struct inode *inode, struct iattr *attr);
@@ -251,8 +270,7 @@ int llu_md_close(struct obd_export *md_exp, struct inode *inode);
 void llu_pack_inode2opdata(struct inode *inode, struct md_op_data *op_data,
                            struct lustre_handle *fh);
 int llu_file_release(struct inode *inode);
-int llu_sizeonmds_update(struct inode *inode, struct lustre_handle *fh,
-                         __u64 ioepoch);
+int llu_som_update(struct inode *inode, struct md_op_data *op_data);
 int llu_iop_close(struct inode *inode);
 _SYSIO_OFF_T llu_iop_pos(struct inode *ino, _SYSIO_OFF_T off);
 int llu_vmtruncate(struct inode * inode, loff_t offset, obd_flag obd_flags);
@@ -383,9 +401,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)
 {