Browse Source

vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_root

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
master
Al Viro 10 years ago
parent
commit
4c1d5a64f1
  1. 2
      arch/ia64/kernel/perfmon.c
  2. 6
      drivers/usb/core/inode.c
  3. 2
      fs/configfs/dir.c
  4. 2
      fs/debugfs/inode.c
  5. 2
      fs/hppfs/hppfs.c
  6. 2
      security/inode.c

2
arch/ia64/kernel/perfmon.c

@ -2228,7 +2228,7 @@ pfm_alloc_file(pfm_context_t *ctx)
/*
* allocate a new dcache entry
*/
path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
path.dentry = d_alloc(pfmfs_mnt->mnt_root, &this);
if (!path.dentry) {
iput(inode);
return ERR_PTR(-ENOMEM);

6
drivers/usb/core/inode.c

@ -501,7 +501,7 @@ static int fs_create_by_name (const char *name, mode_t mode,
*/
if (!parent ) {
if (usbfs_mount && usbfs_mount->mnt_sb) {
parent = usbfs_mount->mnt_sb->s_root;
parent = usbfs_mount->mnt_root;
}
}
@ -608,7 +608,7 @@ static int create_special_files (void)
ignore_mount = 0;
parent = usbfs_mount->mnt_sb->s_root;
parent = usbfs_mount->mnt_root;
devices_usbfs_dentry = fs_create_file ("devices",
listmode | S_IFREG, parent,
NULL, &usbfs_devices_fops,
@ -662,7 +662,7 @@ static void usbfs_add_bus(struct usb_bus *bus)
sprintf (name, "%03d", bus->busnum);
parent = usbfs_mount->mnt_sb->s_root;
parent = usbfs_mount->mnt_root;
bus->usbfs_dentry = fs_create_file (name, busmode | S_IFDIR, parent,
bus, NULL, busuid, busgid);
if (bus->usbfs_dentry == NULL) {

2
fs/configfs/dir.c

@ -312,7 +312,7 @@ static int configfs_create_dir(struct config_item * item, struct dentry *dentry)
if (item->ci_parent)
parent = item->ci_parent->ci_dentry;
else if (configfs_mount && configfs_mount->mnt_sb)
parent = configfs_mount->mnt_sb->s_root;
parent = configfs_mount->mnt_root;
else
return -EFAULT;

2
fs/debugfs/inode.c

@ -160,7 +160,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
* have around.
*/
if (!parent)
parent = debugfs_mount->mnt_sb->s_root;
parent = debugfs_mount->mnt_root;
*dentry = NULL;
mutex_lock(&parent->d_inode->i_mutex);

2
fs/hppfs/hppfs.c

@ -725,7 +725,7 @@ static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
sb->s_fs_info = proc_mnt;
err = -ENOMEM;
root_inode = get_inode(sb, dget(proc_mnt->mnt_sb->s_root));
root_inode = get_inode(sb, dget(proc_mnt->mnt_root));
if (!root_inode)
goto out_mntput;

2
security/inode.c

@ -159,7 +159,7 @@ static int create_by_name(const char *name, mode_t mode,
* have around.
*/
if (!parent)
parent = mount->mnt_sb->s_root;
parent = mount->mnt_root;
mutex_lock(&parent->d_inode->i_mutex);
*dentry = lookup_one_len(name, parent, strlen(name));

Loading…
Cancel
Save