[GFS2] Allow mounting of gfs2 and gfs2meta at the same time

[linux-2.6] / fs / gfs2 / incore.h

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 9a67a5954126cf6552bb5514583aeb3446dd08d3..77f0903d2f3ebbf7511b976c85953fc7ec45535e 100644 (file)
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -157,7 +157,7 @@ struct gfs2_holder {
        unsigned gh_flags;
 
        int gh_error;
-       unsigned gh_iflags;
+       unsigned long gh_iflags;
        struct completion gh_wait;
        unsigned long gh_ip;
 };
@@ -234,7 +234,6 @@ struct gfs2_alloc {
 };
 
 enum {
-       GIF_MIN_INIT            = 0,
        GIF_QD_LOCKED           = 1,
        GIF_PAGED               = 2,
        GIF_SW_PAGED            = 3,
@@ -280,6 +279,7 @@ static inline struct gfs2_sbd *GFS2_SB(struct inode *inode)
 
 enum {
        GFF_DID_DIRECT_ALLOC    = 0,
+       GFF_EXLOCK = 1,
 };
 
 struct gfs2_file {
@@ -472,6 +472,7 @@ enum {
 
 struct gfs2_sbd {
        struct super_block *sd_vfs;
+       struct super_block *sd_vfs_meta;
        struct kobject sd_kobj;
        unsigned long sd_flags; /* SDF_... */
        struct gfs2_sb sd_sb;
@@ -507,7 +508,6 @@ struct gfs2_sbd {
        struct gfs2_holder sd_live_gh;
        struct gfs2_glock *sd_rename_gl;
        struct gfs2_glock *sd_trans_gl;
-       struct mutex sd_invalidate_inodes_mutex;
 
        /* Inode Stuff */
 
@@ -653,6 +653,7 @@ struct gfs2_sbd {
        /* Debugging crud */
 
        unsigned long sd_last_warning;
+       struct vfsmount *sd_gfs2mnt;
 };
 
 #endif /* __INCORE_DOT_H__ */