GFS2: Fix metafs mounts

This patch is intended to fix the issues reported in bz #457798. Instead
of having the metafs as a separate filesystem, it becomes a second root
of gfs2. As a result it will appear as type gfs2 in /proc/mounts, but it
is still possible (for backwards compatibility purposes) to mount it as
type gfs2meta. A new mount flag "meta" is introduced so that its possible
to tell the two cases apart in /proc/mounts.

As a result it becomes possible to mount type gfs2 with -o meta and
get the same result as mounting type gfs2meta. So it is possible to
mount just the metafs on its own. Currently if you do this, its then
impossible to mount the "normal" root of the gfs2 filesystem without
first unmounting the metafs root. I'm not sure if thats a feature or
a bug :-)

Either way, this is a great improvement on the previous scheme and I've
verified that it works ok with bind mounts on both the "normal" root
and the metafs root in various combinations.

There were also a bunch of functions in super.c which didn't belong there,
so this moves them into ops_fstype.c where they can be static. Hopefully
the mount/umount sequence is now more obvious as a result.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Alexander Viro <aviro@redhat.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h
index 448697a5c462..a1777a1927b3 100644
--- a/fs/gfs2/incore.h
+++ b/fs/gfs2/incore.h
@@ -400,6 +400,7 @@ struct gfs2_args {
         int ar_quota; /* off/account/on */
         int ar_suiddir; /* suiddir support */
         int ar_data; /* ordered/writeback */
+        int ar_meta; /* mount metafs */
 };
 
 struct gfs2_tune {
@@ -461,7 +462,6 @@ struct gfs2_sb_host {
 
 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_host sd_sb;
@@ -499,7 +499,9 @@ struct gfs2_sbd {
 
         /* Inode Stuff */
 
-        struct inode *sd_master_dir;
+        struct dentry *sd_master_dir;
+        struct dentry *sd_root_dir;
+
         struct inode *sd_jindex;
         struct inode *sd_inum_inode;
         struct inode *sd_statfs_inode;
@@ -634,7 +636,6 @@ struct gfs2_sbd {
         /* Debugging crud */
 
         unsigned long sd_last_warning;
-        struct vfsmount *sd_gfs2mnt;
         struct dentry *debugfs_dir;    /* debugfs directory */
         struct dentry *debugfs_dentry_glocks; /* for debugfs */
 };