summaryrefslogtreecommitdiffstats
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-01 15:20:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-01 15:20:11 -0700
commit48c4565ed66ee7d045ac8d3c442ca7e588b32bc8 (patch)
treee30a05193f2f8010ccd79064095e05c8fb83d2b5 /fs/namespace.c
parent2728c57fda2c10cb290f1516cab5b170ea2e3f22 (diff)
parente06b933e6ded42384164d28a2060b7f89243b895 (diff)
downloadlinux-stable-48c4565ed66ee7d045ac8d3c442ca7e588b32bc8.tar.gz
linux-stable-48c4565ed66ee7d045ac8d3c442ca7e588b32bc8.tar.bz2
linux-stable-48c4565ed66ee7d045ac8d3c442ca7e588b32bc8.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro: "Tmpfs readdir throughput regression fix (this cycle) + some -stable fodder all over the place. One missing bit is Miklos' tonight locks.c fix - NFS folks had already grabbed that one by the time I woke up ;-)" [ The locks.c fix came through the nfsd tree just moments ago ] * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: namespace: update event counter when umounting a deleted dentry 9p: use file_dentry() ceph: fix d_obtain_alias() misuses lockless next_positive() libfs.c: new helper - next_positive() dcache_{readdir,dir_lseek}(): don't bother with nested ->d_lock
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index 783004af5707..419f746d851d 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1562,6 +1562,7 @@ void __detach_mounts(struct dentry *dentry)
goto out_unlock;
lock_mount_hash();
+ event++;
while (!hlist_empty(&mp->m_list)) {
mnt = hlist_entry(mp->m_list.first, struct mount, mnt_mp_list);
if (mnt->mnt.mnt_flags & MNT_UMOUNT) {