xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 3.14-rc5 into driver-core-next

Browse Source 
We want the fixes in here.
This commit is contained in:
Greg Kroah-Hartman
2014-03-02 20:09:08 -08:00
parent 6d8b3e1ad3 0414855fdc
commit 13df797743
530 changed files with 5366 additions and 3343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/sysfs/mount.c
View File

@@ -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;
}