- unland b_fid to HEAD

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

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 5e0c95b..ce92461 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -35,17 +35,14 @@ struct ll_ra_info {
 };
 
 struct ll_sb_info {
-        /* this protects pglist and max_r_a_pages.  It isn't safe to grab from
-         * interrupt contexts. */
+        /* this protects pglist and ra_info.  It isn't safe to 
+        * grab from interrupt contexts */
         spinlock_t                ll_lock;
-        
         struct obd_uuid           ll_sb_uuid;
-        struct obd_export        *ll_lmv_exp;
-        struct lmv_desc           ll_lmv_desc;
-        struct obd_export        *ll_lov_exp;
-        struct lov_desc           ll_lov_desc;
-        struct proc_dir_entry    *ll_proc_root;
-        struct lustre_id          ll_rootid;     /* root lustre id */
+        struct obd_export        *ll_mdc_exp;
+        struct obd_export        *ll_osc_exp;
+        struct proc_dir_entry*    ll_proc_root;
+        obd_id                    ll_rootino; /* number of root inode */
 
         struct lustre_mount_data *ll_lmd;
         char                     *ll_instance;
@@ -56,7 +53,7 @@ struct ll_sb_info {
         struct hlist_head         ll_orphan_dentry_list; /*please don't ask -p*/
         struct ll_close_queue    *ll_lcq;
 
-        struct lprocfs_stats     *ll_stats;      /* lprocfs stats counter */
+        struct lprocfs_stats     *ll_stats; /* lprocfs stats counter */
 
         unsigned long             ll_pglist_gen;
         struct list_head          ll_pglist;
@@ -156,8 +153,7 @@ struct ll_async_page {
 
 /* llite/lproc_llite.c */
 int lprocfs_register_mountpoint(struct proc_dir_entry *parent,
-                                struct super_block *sb, char *lov,
-                                char *lmv);
+                                struct super_block *sb, char *osc, char *mdc);
 void lprocfs_unregister_mountpoint(struct ll_sb_info *sbi);
 
 /* llite/dir.c */
@@ -206,7 +202,7 @@ int ll_file_release(struct inode *inode, struct file *file);
 int ll_lsm_getattr(struct obd_export *, struct lov_stripe_md *, struct obdo *);
 int ll_glimpse_size(struct inode *inode);
 int ll_local_open(struct file *file, struct lookup_intent *it);
-int ll_mdc_close(struct obd_export *lmv_exp, struct inode *inode,
+int ll_mdc_close(struct obd_export *mdc_exp, struct inode *inode,
                  struct file *file);
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 int ll_getattr(struct vfsmount *mnt, struct dentry *de,
@@ -355,18 +351,18 @@ static inline __u64 ll_ts2u64(time_t *time)
 /* don't need an addref as the sb_info should be holding one */
 static inline struct obd_export *ll_s2obdexp(struct super_block *sb)
 {
-        return ll_s2sbi(sb)->ll_lov_exp;
+        return ll_s2sbi(sb)->ll_osc_exp;
 }
 
 /* don't need an addref as the sb_info should be holding one */
-static inline struct obd_export *ll_s2lmvexp(struct super_block *sb)
+static inline struct obd_export *ll_s2mdcexp(struct super_block *sb)
 {
-        return ll_s2sbi(sb)->ll_lmv_exp;
+        return ll_s2sbi(sb)->ll_mdc_exp;
 }
 
-static inline struct client_obd *sbi2lmv(struct ll_sb_info *sbi)
+static inline struct client_obd *sbi2mdc(struct ll_sb_info *sbi)
 {
-        struct obd_device *obd = sbi->ll_lmv_exp->exp_obd;
+        struct obd_device *obd = sbi->ll_mdc_exp->exp_obd;
         if (obd == NULL)
                 LBUG();
         return &obd->u.cli;
@@ -383,14 +379,14 @@ static inline struct obd_export *ll_i2obdexp(struct inode *inode)
         return ll_s2obdexp(inode->i_sb);
 }
 
-static inline struct obd_export *ll_i2lmvexp(struct inode *inode)
+static inline struct obd_export *ll_i2mdcexp(struct inode *inode)
 {
-        return ll_s2lmvexp(inode->i_sb);
+        return ll_s2mdcexp(inode->i_sb);
 }
 
 static inline int ll_mds_max_easize(struct super_block *sb)
 {
-        return sbi2lmv(ll_s2sbi(sb))->cl_max_mds_easize;
+        return sbi2mdc(ll_s2sbi(sb))->cl_max_mds_easize;
 }
 
 static inline __u64 ll_file_maxbytes(struct inode *inode)