commit d8c9584ea2a92879f471fd3a2be3af6c534fb035
author Al Viro <viro@zeniv.linux.org.uk> Wed Dec 07 18:16:57 2011 -0500
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jan 06 23:16:53 2012 -0500
tree 3541b9c6228f820bdc65e4875156eb27b1c91cb1
parent ece2ccb668046610189d88d6aaf05aeb09c988a1

vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb

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

init/do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 0f6e1d9..b2eee02 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -325,17 +325,19 @@
 
 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
 {
+	struct super_block *s;
 	int err = sys_mount(name, "/root", fs, flags, data);
 	if (err)
 		return err;
 
 	sys_chdir((const char __user __force *)"/root");
-	ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
+	s = current->fs->pwd.dentry->d_sb;
+	ROOT_DEV = s->s_dev;
 	printk(KERN_INFO
 	       "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
-	       current->fs->pwd.mnt->mnt_sb->s_type->name,
-	       current->fs->pwd.mnt->mnt_sb->s_flags & MS_RDONLY ?
-	       " readonly" : "", MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
+	       s->s_type->name,
+	       s->s_flags & MS_RDONLY ?  " readonly" : "",
+	       MAJOR(ROOT_DEV), MINOR(ROOT_DEV));
 	return 0;
 }