afs: use check_submounts_and_drop()

Do have_submounts(), shrink_dcache_parent() and d_drop() atomically.

check_submounts_and_drop() can deal with negative dentries as well.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Miklos Szeredi 2013-09-05 11:44:38 +02:00 committed by Al Viro
parent eed8100766
commit ba81238076
1 changed files with 3 additions and 7 deletions

View File

@ -685,16 +685,12 @@ not_found:
spin_unlock(&dentry->d_lock); spin_unlock(&dentry->d_lock);
out_bad: out_bad:
if (dentry->d_inode) { /* don't unhash if we have submounts */
/* don't unhash if we have submounts */ if (check_submounts_and_drop(dentry) != 0)
if (have_submounts(dentry)) goto out_skip;
goto out_skip;
}
_debug("dropping dentry %s/%s", _debug("dropping dentry %s/%s",
parent->d_name.name, dentry->d_name.name); parent->d_name.name, dentry->d_name.name);
shrink_dcache_parent(dentry);
d_drop(dentry);
dput(parent); dput(parent);
key_put(key); key_put(key);