diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 05:09:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-03 05:09:08 +0100 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /fs/sysfs | |
| parent | kernfs: remove duplicate dir.c at the top dir (diff) | |
| parent | Linux 3.14-rc5 (diff) | |
| download | linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.tar.xz linux-13df7977431e3b906a23bb75f29e0f40a8d73f87.zip | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
Diffstat (limited to 'fs/sysfs')
| -rw-r--r-- | fs/sysfs/mount.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c index 5c7fdd9c6811..a66ad6196f59 100644 --- a/fs/sysfs/mount.c +++ b/fs/sysfs/mount.c @@ -27,6 +27,7 @@ static struct dentry *sysfs_mount(struct file_system_type *fs_type, { struct dentry *root; void *ns; + bool new_sb; if (!(flags & MS_KERNMOUNT)) { if (!capable(CAP_SYS_ADMIN) && !fs_fully_visible(fs_type)) @@ -37,8 +38,8 @@ static struct dentry *sysfs_mount(struct file_system_type *fs_type, } ns = kobj_ns_grab_current(KOBJ_NS_TYPE_NET); - root = kernfs_mount_ns(fs_type, flags, sysfs_root, ns); - if (IS_ERR(root)) + root = kernfs_mount_ns(fs_type, flags, sysfs_root, &new_sb, ns); + if (IS_ERR(root) || !new_sb) kobj_ns_drop(KOBJ_NS_TYPE_NET, ns); return root; } |