b=20970 need add an additional barrier for write_disjoint

[fs/lustre-release.git] / lustre / osd / osd_internal.h

diff --git a/lustre/osd/osd_internal.h b/lustre/osd/osd_internal.h
index 14910aa..b3da83a 100644 (file)
--- a/lustre/osd/osd_internal.h
+++ b/lustre/osd/osd_internal.h
@@ -47,15 +47,23 @@
 
 /* struct rw_semaphore */
 #include <linux/rwsem.h>
-/* handle_t, journal_start(), journal_stop() */
-#include <linux/jbd.h>
-/* struct dx_hash_info */
-#include <linux/ldiskfs_fs.h>
 /* struct dentry */
 #include <linux/dcache.h>
 /* struct dirent64 */
 #include <linux/dirent.h>
 
+#ifdef HAVE_EXT4_LDISKFS
+#include <ldiskfs/ldiskfs.h>
+#include <ldiskfs/ldiskfs_jbd2.h>
+#define osd_journal_callback_set(handle, func, jcb) jbd2_journal_callback_set(handle, func, jcb)
+#else
+#include <linux/jbd.h>
+#include <linux/ldiskfs_fs.h>
+#include <linux/ldiskfs_jbd.h>
+#define osd_journal_callback_set(handle, func, jcb) journal_callback_set(handle, func, jcb)
+#endif
+
+
 /* LUSTRE_OSD_NAME */
 #include <obd.h>
 /* class_register_type(), class_unregister_type(), class_get_type() */
@@ -110,7 +118,7 @@ struct osd_device {
         unsigned long             od_capa_timeout;
         __u32                     od_capa_alg;
         struct lustre_capa_key   *od_capa_keys;
-        struct hlist_head        *od_capa_hash;
+        cfs_hlist_head_t         *od_capa_hash;
 
         cfs_proc_dir_entry_t     *od_proc_entry;
         struct lprocfs_stats     *od_stats;
@@ -118,8 +126,8 @@ struct osd_device {
          * statfs optimization: we cache a bit.
          */
         cfs_time_t                od_osfs_age;
-        struct kstatfs            od_kstatfs;
-        spinlock_t                od_osfs_lock;
+        cfs_kstatfs_t             od_kstatfs;
+        cfs_spinlock_t            od_osfs_lock;
 
         /**
          * The following flag indicates, if it is interop mode or not.
@@ -128,6 +136,16 @@ struct osd_device {
         __u32                     od_iop_mode;
 };
 
+/**
+ * Storage representation for fids.
+ *
+ * Variable size, first byte contains the length of the whole record.
+ */
+struct osd_fid_pack {
+        unsigned char fp_len;
+        char fp_area[sizeof(struct lu_fid)];
+};
+
 struct osd_it_ea_dirent {
         __u64           oied_ino;
         __u64           oied_off;
@@ -194,8 +212,6 @@ struct osd_thread_info {
         struct lustre_capa_key oti_capa_key;
         struct lustre_capa     oti_capa;
 
-        struct lu_fid_pack     oti_pack;
-
         /**
          * following ipd and it structures are used for osd_index_iam_lookup()
          * these are defined separately as we might do index operation
@@ -239,6 +255,8 @@ struct osd_thread_info {
         struct osd_ctxt        oti_ctxt;
 #endif
         struct lu_env          oti_obj_delete_tx_env;
+#define OSD_FID_REC_SZ 32
+        char                   oti_fid_packed[OSD_FID_REC_SZ];
 };
 
 #ifdef LPROCFS
@@ -251,7 +269,7 @@ void osd_lprocfs_time_end(const struct lu_env *env,
                           struct osd_device *osd, int op);
 #endif
 int osd_statfs(const struct lu_env *env, struct dt_device *dev,
-               struct kstatfs *sfs);
+               cfs_kstatfs_t *sfs);
 
 /*
  * Invariants, assertions.