LU-6895 osd-ldiskfs: handle REMOTE_PARENT_DIR properly

[fs/lustre-release.git] / lustre / osd-ldiskfs / osd_oi.h

diff --git a/lustre/osd-ldiskfs/osd_oi.h b/lustre/osd-ldiskfs/osd_oi.h
index 5ddf162..c9d727d 100644 (file)
--- 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;
@@ -145,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 */