summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-12-09 05:01:06 +0100
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-04 04:52:42 +0100
commitc972b4bc8331b432f51a5f1bc3ca7e020172717f (patch)
tree2eefe85d32357b53c51a14c84bca7ea4ff47876b /drivers
parentvfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_root (diff)
downloadlinux-c972b4bc8331b432f51a5f1bc3ca7e020172717f.tar.xz
linux-c972b4bc8331b432f51a5f1bc3ca7e020172717f.zip
vfs: live vfsmounts never have NULL ->mnt_sb
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/core/inode.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 0a4613df6c30..783fde7f44c8 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -264,7 +264,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
return -EINVAL;
}
- if (usbfs_mount && usbfs_mount->mnt_sb)
+ if (usbfs_mount)
update_sb(usbfs_mount->mnt_sb);
return 0;
@@ -500,9 +500,8 @@ static int fs_create_by_name (const char *name, mode_t mode,
* have around.
*/
if (!parent ) {
- if (usbfs_mount && usbfs_mount->mnt_sb) {
+ if (usbfs_mount)
parent = usbfs_mount->mnt_root;
- }
}
if (!parent) {