aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-12-07 18:21:57 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:52:41 -0500
commit4c1d5a64f134b254552b6211f6f79a1da667eab7 (patch)
tree130b704f727054b93f2a784a8d08252a1ecda3a0 /fs
parent32dc730860155b235f13e0cd3fe58b263279baf9 (diff)
vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_root
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/configfs/dir.c2
-rw-r--r--fs/debugfs/inode.c2
-rw-r--r--fs/hppfs/hppfs.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 9a37a9b6de3a..36b1d7aadba1 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -312,7 +312,7 @@ static int configfs_create_dir(struct config_item * item, struct dentry *dentry)
312 if (item->ci_parent) 312 if (item->ci_parent)
313 parent = item->ci_parent->ci_dentry; 313 parent = item->ci_parent->ci_dentry;
314 else if (configfs_mount && configfs_mount->mnt_sb) 314 else if (configfs_mount && configfs_mount->mnt_sb)
315 parent = configfs_mount->mnt_sb->s_root; 315 parent = configfs_mount->mnt_root;
316 else 316 else
317 return -EFAULT; 317 return -EFAULT;
318 318
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index f3a257d7a985..c9dc08d0c100 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -160,7 +160,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
160 * have around. 160 * have around.
161 */ 161 */
162 if (!parent) 162 if (!parent)
163 parent = debugfs_mount->mnt_sb->s_root; 163 parent = debugfs_mount->mnt_root;
164 164
165 *dentry = NULL; 165 *dentry = NULL;
166 mutex_lock(&parent->d_inode->i_mutex); 166 mutex_lock(&parent->d_inode->i_mutex);
diff --git a/fs/hppfs/hppfs.c b/fs/hppfs/hppfs.c
index 30883a7adacb..d92f4ce80925 100644
--- a/fs/hppfs/hppfs.c
+++ b/fs/hppfs/hppfs.c
@@ -725,7 +725,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
725 sb->s_fs_info = proc_mnt; 725 sb->s_fs_info = proc_mnt;
726 726
727 err = -ENOMEM; 727 err = -ENOMEM;
728 root_inode = get_inode(sb, dget(proc_mnt->mnt_sb->s_root)); 728 root_inode = get_inode(sb, dget(proc_mnt->mnt_root));
729 if (!root_inode) 729 if (!root_inode)
730 goto out_mntput; 730 goto out_mntput;
731 731