diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-27 12:18:01 +0800 |
| commit | ffc4aa8f521606f63f59ff708f49780172909e94 (patch) | |
| tree | 274944bdc4c317e54faa95636c9f1771d8d51b43 /kernel/bpf/inode.c | |
| parent | 46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff) | |
| parent | 9ca1d50fa959cda1f04f43275f7930a70f1a631e (diff) | |
Merge tag 'v4.4.14' into linux-linaro-lsk-v4.4lsk-v4.4-16.06
This is the 4.4.14 stable release
Diffstat (limited to 'kernel/bpf/inode.c')
| -rw-r--r-- | kernel/bpf/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/bpf/inode.c b/kernel/bpf/inode.c index d1a7646f79c5..cb85d228b1ac 100644 --- a/kernel/bpf/inode.c +++ b/kernel/bpf/inode.c @@ -358,7 +358,7 @@ static int bpf_fill_super(struct super_block *sb, void *data, int silent) static struct dentry *bpf_mount(struct file_system_type *type, int flags, const char *dev_name, void *data) { - return mount_ns(type, flags, current->nsproxy->mnt_ns, bpf_fill_super); + return mount_nodev(type, flags, data, bpf_fill_super); } static struct file_system_type bpf_fs_type = { @@ -366,7 +366,6 @@ static struct file_system_type bpf_fs_type = { .name = "bpf", .mount = bpf_mount, .kill_sb = kill_litter_super, - .fs_flags = FS_USERNS_MOUNT, }; MODULE_ALIAS_FS("bpf"); |