diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-17 17:26:53 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-17 17:26:53 +0900 |
commit | ccd3d905f74abbfef4960d6262f057fbb4a02903 (patch) | |
tree | 29dfbb1ca0069f9b42b060b89b1ccd1b1389404d | |
parent | 1439ccf73d9c07654fdd5b4969fd53c2feb8684d (diff) | |
parent | 4068367c9ca7b515a209f9c0c8741309a1e90495 (diff) | |
download | linux-ccd3d905f74abbfef4960d6262f057fbb4a02903.tar.gz linux-ccd3d905f74abbfef4960d6262f057fbb4a02903.tar.bz2 linux-ccd3d905f74abbfef4960d6262f057fbb4a02903.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A couple of fixes; a leak in mntns_install() caught by Andrei (this
cycle regression) + d_invalidate() softlockup fix - that had been
reported by a bunch of people lately, but the problem is pretty old"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fs: don't forget to put old mntns in mntns_install
Hang/soft lockup in d_invalidate with simultaneous calls
-rw-r--r-- | fs/dcache.c | 10 | ||||
-rw-r--r-- | fs/namespace.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index cddf39777835..a9f995f6859e 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1494,7 +1494,7 @@ static void check_and_drop(void *_data) { struct detach_data *data = _data; - if (!data->mountpoint && !data->select.found) + if (!data->mountpoint && list_empty(&data->select.dispose)) __d_drop(data->select.start); } @@ -1536,17 +1536,15 @@ void d_invalidate(struct dentry *dentry) d_walk(dentry, &data, detach_and_collect, check_and_drop); - if (data.select.found) + if (!list_empty(&data.select.dispose)) shrink_dentry_list(&data.select.dispose); + else if (!data.mountpoint) + return; if (data.mountpoint) { detach_mounts(data.mountpoint); dput(data.mountpoint); } - - if (!data.mountpoint && !data.select.found) - break; - cond_resched(); } } diff --git a/fs/namespace.c b/fs/namespace.c index 8bd3e4d448b9..5a4438445bf7 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -3488,6 +3488,8 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns) return err; } + put_mnt_ns(old_mnt_ns); + /* Update the pwd and root */ set_fs_pwd(fs, &root); set_fs_root(fs, &root); |