X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fosd-ldiskfs%2Fosd_oi.h;h=c9d727d211b91d892f8728f2e8f884b0ad3034ce;hb=6bf1d78ed87dc25cef0e8a48f1ef251f9bb017a8;hp=65e85ac5d04cad97c43759124387d7fcf19eb13a;hpb=0bc85700a2e41f369173e92bbe06b27ed1145618;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_oi.h b/lustre/osd-ldiskfs/osd_oi.h
index 65e85ac..c9d727d 100644
--- a/lustre/osd-ldiskfs/osd_oi.h
+++ b/lustre/osd-ldiskfs/osd_oi.h
@@ -49,10 +49,10 @@
 #ifndef _OSD_OI_H
 #define _OSD_OI_H
 
-#if defined(__KERNEL__)
 
 /* struct rw_semaphore */
 #include <linux/rwsem.h>
+#include <linux/jbd2.h>
 #include <lustre_fid.h>
 #include <lu_object.h>
 #include <md_object.h>
@@ -65,7 +65,6 @@
 struct lu_fid;
 struct osd_thread_info;
 struct lu_site;
-struct thandle;
 
 struct dt_device;
 struct osd_device;
@@ -87,6 +86,7 @@ struct osd_inode_id {
 struct osd_idmap_cache {
 	struct lu_fid		oic_fid;
 	struct osd_inode_id	oic_lid;
+	struct osd_device	*oic_dev;
 };
 
 static inline void osd_id_pack(struct osd_inode_id *tgt,
@@ -144,15 +144,14 @@ int  osd_oi_lookup(struct osd_thread_info *info, struct osd_device *osd,
 		   enum oi_check_flags flags);
 int  osd_oi_insert(struct osd_thread_info *info, struct osd_device *osd,
 		   const struct lu_fid *fid, const struct osd_inode_id *id,
-		   struct thandle *th, enum oi_check_flags flags);
+		   handle_t *th, enum oi_check_flags flags);
 int  osd_oi_delete(struct osd_thread_info *info,
 		   struct osd_device *osd, const struct lu_fid *fid,
-		   struct thandle *th, enum oi_check_flags flags);
+		   handle_t *th, enum oi_check_flags flags);
 int  osd_oi_update(struct osd_thread_info *info, struct osd_device *osd,
 		   const struct lu_fid *fid, const struct osd_inode_id *id,
-		   struct thandle *th, enum oi_check_flags flags);
+		   handle_t *th, enum oi_check_flags flags);
 
 int fid_is_on_ost(struct osd_thread_info *info, struct osd_device *osd,
 		  const struct lu_fid *fid, enum oi_check_flags flags);
-#endif /* __KERNEL__ */
 #endif /* _OSD_OI_H */