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

[karo-tx-linux.git] / fs / gfs2 / dentry.c

diff --git a/fs/gfs2/dentry.c b/fs/gfs2/dentry.c
index d3a5d4e29ba5f37b10f4f0fd0043c7e9847b9923..2ecc2b873829efc8b2eca4d1161f8fa991a8e753 100644 (file)
--- a/fs/gfs2/dentry.c
+++ b/fs/gfs2/dentry.c
@@ -93,9 +93,7 @@ invalid_gunlock:
        if (!had_lock)
                gfs2_glock_dq_uninit(&d_gh);
 invalid:
-       if (check_submounts_and_drop(dentry) != 0)
-               goto valid;
-
+       shrink_submounts_and_drop(dentry);
        dput(parent);
        return 0;