- returned back OBD_MD_FID. For many reasons its removal was wrong.

[fs/lustre-release.git] / lustre / mds / mds_internal.h

diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h
index a035934..be2fcfc 100644 (file)
--- a/lustre/mds/mds_internal.h
+++ b/lustre/mds/mds_internal.h
@@ -30,33 +30,6 @@ static inline struct obd_device *req2obd(struct ptlrpc_request *req)
         return req->rq_export->exp_obd;
 }
 
-typedef enum {
-        MDS_OPEN_COUNT         = 0,
-        MDS_CREATE_COUNT       = 1,
-        MDS_CLOSE_COUNT        = 2,
-        MDS_LINK_COUNT         = 3,
-        MDS_UNLINK_COUNT       = 4,
-        MDS_GETATTR_COUNT      = 5,
-        MDS_GETATTR_NAME_COUNT = 6,
-        MDS_SETATTR_COUNT      = 7,
-        MDS_RENAME_COUNT       = 8,
-        MDS_STATFS_COUNT       = 9,
-        MDS_LAST_OPC_COUNT     = 10
-} mds_counters_t;
-
-struct lprocfs_stats * lprocfs_alloc_mds_counters(void);
-void lprocfs_free_mds_counters(struct lprocfs_stats *ptr);
-
-#ifndef LPROCFS
-#define MDS_UPDATE_COUNTER(mds, opcode) do {} while (0)
-#else
-
-#define MDS_UPDATE_COUNTER(mds, opcode) \
-        LASSERT( opcode < MDS_LAST_OPC_COUNT); \
-        LASSERT( mds->mds_counters != NULL); \
-        lprocfs_counter_incr(mds->mds_counters, opcode);
-#endif
-
 #ifdef __KERNEL__
 /* Open counts for files.  No longer atomic, must hold inode->i_sem */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
@@ -141,20 +114,20 @@ int mds_llog_init(struct obd_device *obd, struct obd_llogs *,
 int mds_llog_finish(struct obd_device *obd, struct obd_llogs *, int count);
 
 /* mds/mds_lov.c */
-int mds_lov_connect(struct obd_device *obd, char * lov_name);
-int mds_lov_disconnect(struct obd_device *obd, int flags);
-int mds_lov_set_info(struct obd_export *exp, obd_count keylen,
+int mds_dt_connect(struct obd_device *obd, char * lov_name);
+int mds_dt_disconnect(struct obd_device *obd, int flags);
+int mds_dt_set_info(struct obd_export *exp, obd_count keylen,
                      void *key, obd_count vallen, void *val);
 int mds_get_lovtgts(struct obd_device *, int tgt_count, struct obd_uuid *);
-int mds_lov_write_objids(struct obd_device *obd);
-void mds_lov_update_objids(struct obd_device *obd, obd_id *ids);
-int mds_lov_set_growth(struct mds_obd *mds, int count);
-int mds_lov_set_nextid(struct obd_device *obd);
-int mds_lov_clearorphans(struct mds_obd *mds, struct obd_uuid *ost_uuid);
+int mds_dt_write_objids(struct obd_device *obd);
+void mds_dt_update_objids(struct obd_device *obd, obd_id *ids);
+int mds_dt_set_growth(struct mds_obd *mds, int count);
+int mds_dt_set_nextid(struct obd_device *obd);
+int mds_dt_clearorphans(struct mds_obd *mds, struct obd_uuid *ost_uuid);
 int mds_post_mds_lovconf(struct obd_device *obd);
 int mds_notify(struct obd_device *obd, struct obd_device *watched,
                int active, void *data);
-int mds_lov_update_config(struct obd_device *obd, int transno);
+int mds_dt_update_config(struct obd_device *obd, int transno);
 int mds_convert_lov_ea(struct obd_device *obd, struct inode *inode,
                        struct lov_mds_md *lmm, int lmm_size);
 int mds_revalidate_lov_ea(struct obd_device *obd, struct inode *inode,
@@ -186,7 +159,7 @@ void mds_squash_root(struct mds_obd *mds, struct mds_req_sec_desc *rsd,
                      ptl_nid_t *peernid);
 int mds_handle(struct ptlrpc_request *req);
 extern struct lvfs_callback_ops mds_lvfs_ops;
-int mds_lov_clean(struct obd_device *obd);
+int mds_dt_clean(struct obd_device *obd);
 int mds_postrecov(struct obd_device *obd);
 extern struct lvfs_callback_ops mds_lvfs_ops;
 
@@ -201,6 +174,8 @@ extern int mds_lock_mode_for_dir(struct obd_device *,
 int mds_fs_setup_rootid(struct obd_device *obd);
 int mds_fs_setup_virtid(struct obd_device *obd);
 
+__u64 mds_alloc_fid(struct obd_device *obd);
+
 int mds_alloc_inode_sid(struct obd_device *, struct inode *,
                         void *, struct lustre_id *);
 
@@ -245,14 +220,14 @@ void mds_pack_dentry2body(struct obd_device *, struct mds_body *b,
 #endif
 
 /* mds/mds_lmv.c */
-int mds_lmv_postsetup(struct obd_device *obd);
-int mds_lmv_connect(struct obd_device *obd, char * lov_name);
-int mds_lmv_disconnect(struct obd_device *obd, int flags);
+int mds_md_postsetup(struct obd_device *obd);
+int mds_md_connect(struct obd_device *obd, char * lov_name);
+int mds_md_disconnect(struct obd_device *obd, int flags);
 int mds_try_to_split_dir(struct obd_device *, struct dentry *, struct mea **,
                          int, int);
-int mds_get_lmv_attr(struct obd_device *, struct inode *, struct mea **, int *);
+int mds_md_get_attr(struct obd_device *, struct inode *, struct mea **, int *);
 int mds_choose_mdsnum(struct obd_device *, const char *, int, int);
-int mds_lmv_postsetup(struct obd_device *);
+int mds_md_postsetup(struct obd_device *);
 int mds_splitting_expected(struct obd_device *, struct dentry *);
 int mds_lock_slave_objs(struct obd_device *, struct dentry *,
                         struct lustre_handle **);