commit c96e41e92b4aaf11e1f9775ecf0d1c8cbff829ed
author Al Viro <viro@zeniv.linux.org.uk> Sun Jul 25 00:17:56 2010 +0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Oct 29 04:15:06 2010 -0400
tree 5c24ad8aa541018a51e1704dccfc370116bb932f
parent d893f1bc2a9f0f7dcb4b433452c59f9bedac0d7d

beginning of transtion: ->mount()

eventual replacement for ->get_sb() - does *not* get vfsmount,
return ERR_PTR(error) or root of subtree to be mounted.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

fs/super.c

diff --git a/fs/super.c b/fs/super.c
index b9c9869..00a2c96 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -918,6 +918,7 @@
 vfs_kern_mount(struct file_system_type *type, int flags, const char *name, void *data)
 {
 	struct vfsmount *mnt;
+	struct dentry *root;
 	char *secdata = NULL;
 	int error;
 
@@ -942,9 +943,19 @@
 			goto out_free_secdata;
 	}
 
-	error = type->get_sb(type, flags, name, data, mnt);
-	if (error < 0)
-		goto out_free_secdata;
+	if (type->mount) {
+		root = type->mount(type, flags, name, data);
+		if (IS_ERR(root)) {
+			error = PTR_ERR(root);
+			goto out_free_secdata;
+		}
+		mnt->mnt_root = root;
+		mnt->mnt_sb = root->d_sb;
+	} else {
+		error = type->get_sb(type, flags, name, data, mnt);
+		if (error < 0)
+			goto out_free_secdata;
+	}
 	BUG_ON(!mnt->mnt_sb);
 	WARN_ON(!mnt->mnt_sb->s_bdi);
 	mnt->mnt_sb->s_flags |= MS_BORN;