diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-06 17:13:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-06 17:13:21 -0800 |
| commit | 75d4276e83a353d5e41da676f418d4a12f6f6e6c (patch) | |
| tree | d3d9a43afa64f5d358b99b987b7ad8c0e2847dac /fs | |
| parent | 5b6c02f38315b720c593c6079364855d276886aa (diff) | |
| parent | 040ee69226f8a96b7943645d68f41d5d44b5ff7d (diff) | |
| download | linux-75d4276e83a353d5e41da676f418d4a12f6f6e6c.tar.gz linux-75d4276e83a353d5e41da676f418d4a12f6f6e6c.tar.bz2 linux-75d4276e83a353d5e41da676f418d4a12f6f6e6c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
- untangle sys_close() abuses in xt_bpf
- deal with register_shrinker() failures in sget()
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fix "netfilter: xt_bpf: Fix XT_BPF_MODE_FD_PINNED mode of 'xt_bpf_info_v1'"
sget(): handle failures of register_shrinker()
mm,vmscan: Make unregister_shrinker() no-op if register_shrinker() failed.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/super.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/super.c b/fs/super.c index 7ff1349609e4..06bd25d90ba5 100644 --- a/fs/super.c +++ b/fs/super.c @@ -517,7 +517,11 @@ retry: hlist_add_head(&s->s_instances, &type->fs_supers); spin_unlock(&sb_lock); get_filesystem(type); - register_shrinker(&s->s_shrink); + err = register_shrinker(&s->s_shrink); + if (err) { + deactivate_locked_super(s); + s = ERR_PTR(err); + } return s; } |