mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
This commit is contained in:
commit
13df797743
530 changed files with 5359 additions and 3336 deletions
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue