Fix problem with multiple connections to the same local device.

[fs/lustre-release.git] / lustre / include / linux / lustre_lite.h

diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h
index 3f62ec7..41c9093 100644 (file)
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -20,7 +20,6 @@
 #include <linux/lustre_net.h>
 #include <linux/lustre_mds.h>
 #include <linux/lustre_ha.h>
-#include <linux/obdo.h>
 
 extern kmem_cache_t *ll_file_data_slab;
 struct ll_file_data {
@@ -31,7 +30,7 @@ struct ll_file_data {
 
 struct ll_inode_md {
         struct mds_body *body;
-        struct obdo *obdo;
+        struct lov_stripe_md *md;
 };
 
 #define LL_IOC_GETFLAGS                 _IOR ('f', 151, long)
@@ -43,7 +42,10 @@ struct ll_inode_md {
 #define LL_INLINESZ      60
 struct ll_inode_info {
         int              lli_flags;
-        struct obdo     *lli_obdo;
+        //        struct obdo     *lli_obdo;
+        struct  lov_stripe_md *lli_smd;
+        //        int              lli_obdo_mdsz;
+        //void            *lli_obdo_md;
         char            *lli_symlink_name;
         char             lli_inline[LL_INLINESZ];
         struct lustre_handle lli_intent_lock_handle;
@@ -56,9 +58,9 @@ struct ll_inode_info {
 #define LL_COMMITCBD_RUNNING   0x4
 
 struct ll_sb_info {
-        struct obd_conn           ll_mdc_conn;
-        struct obd_conn           ll_osc_conn;
-        ino_t                     ll_rootino; /* number of root inode */
+        struct lustre_handle      ll_mdc_conn;
+        struct lustre_handle      ll_osc_conn;
+        obd_id                    ll_rootino; /* number of root inode */
 
         wait_queue_head_t         ll_commitcbd_waitq;
         wait_queue_head_t         ll_commitcbd_ctl_waitq;
@@ -75,14 +77,16 @@ static inline struct ll_sb_info *ll_s2sbi(struct super_block *sb)
         return (struct ll_sb_info *)(sb->u.generic_sbp);
 }
 
-static inline struct obd_conn *ll_s2obdconn(struct super_block *sb)
+static inline struct lustre_handle *ll_s2obdconn(struct super_block *sb)
 {
         return &(ll_s2sbi(sb))->ll_osc_conn;
 }
 
 static inline struct mdc_obd *sbi2mdc(struct ll_sb_info *sbi)
 {
-        struct obd_device *obd = gen_conn2obd(&sbi->ll_mdc_conn);
+        struct obd_device *obd = class_conn2obd(&sbi->ll_mdc_conn);
+        if (obd == NULL)
+                LBUG();
         return &obd->u.mdc;
 }
 
@@ -102,15 +106,15 @@ static inline int ll_has_inline(struct inode *inode)
 }
 
 
-static inline struct obd_conn *ll_i2obdconn(struct inode *inode)
+static inline struct lustre_handle *ll_i2obdconn(struct inode *inode)
 {
         return ll_s2obdconn(inode->i_sb);
 }
 
-static inline void ll_ino2fid(struct ll_fid *fid, ino_t ino, __u32 generation,
+static inline void ll_ino2fid(struct ll_fid *fid, obd_id ino, __u32 generation,
                               int type)
 {
-        fid->id = (__u64)ino;
+        fid->id = ino;
         fid->generation = generation;
         fid->f_type = type;
 }
@@ -126,7 +130,8 @@ int ll_lock(struct inode *dir, struct dentry *dentry,
             struct lookup_intent *it, struct lustre_handle *lockh);
 int ll_unlock(__u32 mode, struct lustre_handle *lockh);
 
-
+/* dcache.c */
+void ll_intent_release(struct dentry *de);
 
 /* dir.c */
 extern struct file_operations ll_dir_operations;