Merge remote-tracking branch 'userns/for-next'

[karo-tx-linux.git] / fs / afs / dir.c

diff --git a/fs/afs/dir.c b/fs/afs/dir.c
index 529300327f4574d2dc36345be3c7398442548e08..3756d4fe129fe13bf98995ce37e2321eff0b2fbf 100644 (file)
--- a/fs/afs/dir.c
+++ b/fs/afs/dir.c
@@ -683,8 +683,7 @@ not_found:
 
 out_bad:
        /* don't unhash if we have submounts */
-       if (check_submounts_and_drop(dentry) != 0)
-               goto out_skip;
+       shrink_submounts_and_drop(dentry);
 
        _debug("dropping dentry %s/%s",
               parent->d_name.name, dentry->d_name.name);