Branch HEAD

[fs/lustre-release.git] / lustre / include / linux / lvfs_linux.h

diff --git a/lustre/include/linux/lvfs_linux.h b/lustre/include/linux/lvfs_linux.h
index 9c41cd0..c7b0f7d 100644 (file)
--- a/lustre/include/linux/lvfs_linux.h
+++ b/lustre/include/linux/lvfs_linux.h
@@ -35,6 +35,15 @@ struct l_readdir_callback {
         struct list_head      *lrc_list;
 };
 
+#define LVFS_DENTRY_PARAM_MAGIC         20070216UL
+struct lvfs_dentry_params
+{
+        unsigned long    ldp_inum;
+        void            *ldp_ptr;
+        __u32            ldp_magic;
+};
+#define LVFS_DENTRY_PARAMS_INIT         { .ldp_magic = LVFS_DENTRY_PARAM_MAGIC }
+
 # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #  define BDEVNAME_DECLARE_STORAGE(foo) char foo[BDEVNAME_SIZE]
 #  define ll_bdevname(SB, STORAGE) __bdevname(kdev_t_to_nr(SB->s_dev), STORAGE)
@@ -50,8 +59,11 @@ struct l_readdir_callback {
 #  define lvfs_sbdev_sync      fsync_dev
 # endif
 
-void lvfs_set_rdonly(lvfs_sbdev_type dev);
+/* Instead of calling within lvfs (a layering violation) */
+#define lvfs_set_rdonly(obd, sb) \
+        __lvfs_set_rdonly(lvfs_sbdev(sb), fsfilt_journal_sbdev(obd, sb))
+
+void __lvfs_set_rdonly(lvfs_sbdev_type dev, lvfs_sbdev_type jdev);
 int lvfs_check_rdonly(lvfs_sbdev_type dev);
-void lvfs_clear_rdonly(lvfs_sbdev_type dev);
 
-#endif
+#endif /*  __LVFS_LINUX_H__ */