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