diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 12:22:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-09 12:22:49 -0700 |
| commit | e8f2b548de7ae65e17ee911e54712a3f26f69c60 (patch) | |
| tree | 0b332c254088effc61d832f9e95d65861251214e /fs/namespace.c | |
| parent | 43ecdb0d31cf63d99d060af0585bf59be7fafcb2 (diff) | |
| parent | e9c5d8a562f01b211926d70443378eb14b29a676 (diff) | |
| download | linux-e8f2b548de7ae65e17ee911e54712a3f26f69c60.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A nasty bug in fs/namespace.c caught by Andrey + a couple of less
serious unpleasantness - ecryptfs misc device playing hopeless games
with try_module_get() and palinfo procfs support being... not quite
correctly done, to be polite."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
mnt: release locks on error path in do_loopback
palinfo fixes
procfs: add proc_remove_subtree()
ecryptfs: close rmmod race
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index d581e45c0a9f..341d3f564082 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1690,7 +1690,7 @@ static int do_loopback(struct path *path, const char *old_name, if (IS_ERR(mnt)) { err = PTR_ERR(mnt); - goto out; + goto out2; } err = graft_tree(mnt, path); |