summaryrefslogtreecommitdiff
path: root/fs/autofs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-09-18 05:16:58 +0300
committerAl Viro <viro@zeniv.linux.org.uk>2019-09-18 05:16:58 +0300
commite509d6e9c1ab54af257d4ed95b30d41e3d786857 (patch)
tree83e69fbfdd7eb7cebfc21cddbf107b38c5762dac /fs/autofs
parent5f68056ca50fdd3954a93ae66fea7452abddb66f (diff)
downloadlinux-e509d6e9c1ab54af257d4ed95b30d41e3d786857.tar.xz
autofs_clear_leaf_automount_flags(): use ino->count instead of ->d_subdirs
We want to find out if the parent will become empty after we remove the victim of rmdir(). Checking if the victim is the only element of parent's ->d_subdirs is completely wrong - e.g. opening the parent will end up with a cursor added to its ->d_parent and fooling the check. We do maintain ino->count - 0 for anything removed, 1 + number of children for anything live. Which gives us precisely what we need for that check... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/autofs')
-rw-r--r--fs/autofs/root.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/autofs/root.c b/fs/autofs/root.c
index 29abafc0ce31..2065281ee8b1 100644
--- a/fs/autofs/root.c
+++ b/fs/autofs/root.c
@@ -660,7 +660,6 @@ static void autofs_set_leaf_automount_flags(struct dentry *dentry)
static void autofs_clear_leaf_automount_flags(struct dentry *dentry)
{
- struct list_head *d_child;
struct dentry *parent;
/* flags for dentrys in the root are handled elsewhere */
@@ -673,10 +672,7 @@ static void autofs_clear_leaf_automount_flags(struct dentry *dentry)
/* only consider parents below dentrys in the root */
if (IS_ROOT(parent->d_parent))
return;
- d_child = &dentry->d_child;
- /* Set parent managed if it's becoming empty */
- if (d_child->next == &parent->d_subdirs &&
- d_child->prev == &parent->d_subdirs)
+ if (atomic_read(&autofs_dentry_ino(parent)->count) == 2)
managed_dentry_set_managed(parent);
}