From: Andrew Morton <akpm@osdl.org>

Update GFS2 for dhowells API changes.

Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/gfs2/ops_fstype.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff -puN fs/gfs2/ops_fstype.c~gfs2-get_sb_dev-fix fs/gfs2/ops_fstype.c
--- a/fs/gfs2/ops_fstype.c~gfs2-get_sb_dev-fix
+++ a/fs/gfs2/ops_fstype.c
@@ -812,11 +812,10 @@ static int fill_super(struct super_block
 	return error;
 }
 
-static struct super_block *gfs2_get_sb(struct file_system_type *fs_type,
-				       int flags, const char *dev_name,
-				       void *data)
+static int gfs2_get_sb(struct file_system_type *fs_type, int flags,
+		const char *dev_name, void *data, struct vfsmount *mnt)
 {
-	return get_sb_bdev(fs_type, flags, dev_name, data, fill_super);
+	return get_sb_bdev(fs_type, flags, dev_name, data, fill_super, mnt);
 }
 
 static void gfs2_kill_sb(struct super_block *sb)
_