summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-12-08 23:01:06 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-01-03 22:52:42 -0500
commitc972b4bc8331b432f51a5f1bc3ca7e020172717f (patch)
tree2eefe85d32357b53c51a14c84bca7ea4ff47876b
parent4c1d5a64f134b254552b6211f6f79a1da667eab7 (diff)
downloadop-kernel-dev-c972b4bc8331b432f51a5f1bc3ca7e020172717f.zip
op-kernel-dev-c972b4bc8331b432f51a5f1bc3ca7e020172717f.tar.gz
vfs: live vfsmounts never have NULL ->mnt_sb
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/usb/core/inode.c5
-rw-r--r--fs/configfs/dir.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 0a4613d..783fde7 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) {
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 36b1d7a..1c52969 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -311,7 +311,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)
+ else if (configfs_mount)
parent = configfs_mount->mnt_root;
else
return -EFAULT;
OpenPOWER on IntegriCloud