LU-6201 llite: remove duplicate fiemap defines

[fs/lustre-release.git] / lustre / ofd / ofd_internal.h

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index e2a1f77..a5c681b 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -42,7 +42,6 @@
 #include <dt_object.h>
 #include <md_object.h>
 #include <lustre_fid.h>
-#include <lustre_capa.h>
 
 #define OFD_INIT_OBJID 0
 #define OFD_PRECREATE_BATCH_DEFAULT (OBJ_SUBDIR_COUNT * 4)
@@ -253,13 +252,6 @@ static inline struct ofd_device *ofd_obj2dev(const struct ofd_object *fo)
        return ofd_dev(fo->ofo_obj.do_lu.lo_dev);
 }
 
-static inline struct lustre_capa *ofd_object_capa(const struct lu_env *env,
-                                                 const struct ofd_object *obj)
-{
-       /* TODO: see mdd_object_capa() */
-       return BYPASS_CAPA;
-}
-
 static inline void ofd_read_lock(const struct lu_env *env,
                                 struct ofd_object *fo)
 {
@@ -333,17 +325,11 @@ struct ofd_thread_info {
 extern void target_recovery_fini(struct obd_device *obd);
 extern void target_recovery_init(struct lu_target *lut, svc_handler_t handler);
 
-/* ofd_capa.c */
-int ofd_update_capa_key(struct ofd_device *ofd, struct lustre_capa_key *key);
-int ofd_auth_capa(struct obd_export *exp, const struct lu_fid *fid,
-                 u64 seq, struct lustre_capa *capa, __u64 opc);
-void ofd_free_capa_keys(struct ofd_device *ofd);
-
 /* ofd_dev.c */
 extern struct lu_context_key ofd_thread_key;
 int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd);
 int ofd_fiemap_get(const struct lu_env *env, struct ofd_device *ofd,
-                  struct lu_fid *fid, struct ll_user_fiemap *fiemap);
+                  struct lu_fid *fid, struct fiemap *fiemap);
 
 /* ofd_obd.c */
 extern struct obd_ops ofd_obd_ops;
@@ -382,13 +368,11 @@ int ofd_verify_ff(const struct lu_env *env, struct ofd_object *fo,
 int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp,
               struct obdo *oa, int objcount, struct obd_ioobj *obj,
               struct niobuf_remote *rnb, int *nr_local,
-              struct niobuf_local *lnb, struct obd_trans_info *oti,
-              struct lustre_capa *capa);
+              struct niobuf_local *lnb);
 int ofd_commitrw(const struct lu_env *env, int cmd, struct obd_export *exp,
                 struct obdo *oa, int objcount, struct obd_ioobj *obj,
                 struct niobuf_remote *rnb, int npages,
-                struct niobuf_local *lnb, struct obd_trans_info *oti,
-                int old_rc);
+                struct niobuf_local *lnb, int old_rc);
 
 /* ofd_trans.c */
 struct thandle *ofd_trans_create(const struct lu_env *env,
@@ -403,7 +387,7 @@ int ofd_txn_stop_cb(const struct lu_env *env, struct thandle *txn,
 
 /* lproc_ofd.c */
 #ifdef CONFIG_PROC_FS
-extern struct lprocfs_seq_vars lprocfs_ofd_obd_vars[];
+extern struct lprocfs_vars lprocfs_ofd_obd_vars[];
 void ofd_stats_counter_init(struct lprocfs_stats *stats);
 #else
 static inline void ofd_stats_counter_init(struct lprocfs_stats *stats) {}
@@ -578,20 +562,6 @@ static inline struct ofd_thread_info *tsi2ofd_info(struct tgt_session_info *tsi)
        return info;
 }
 
-static inline void ofd_oti2info(struct ofd_thread_info *info,
-                               struct obd_trans_info *oti)
-{
-       info->fti_xid = oti->oti_xid;
-       info->fti_pre_version = oti->oti_pre_version;
-}
-
-static inline void ofd_info2oti(struct ofd_thread_info *info,
-                                struct obd_trans_info *oti)
-{
-       oti->oti_xid = info->fti_xid;
-       oti->oti_pre_version = info->fti_pre_version;
-}
-
 /* sync on lock cancel is useless when we force a journal flush,
  * and if we enable async journal commit, we should also turn on
  * sync on lock cancel if it is not enabled already. */