Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1191a2bd authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

gfs2: use check_submounts_and_drop()



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

check_submounts_and_drop() can deal with negative dentries and
non-directories as well.

Non-directories can also be mounted on.  And just like directories we don't
want these to disappear with invalidation.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
CC: Steven Whitehouse <swhiteho@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ba812380
Loading
Loading
Loading
Loading
+3 −6
Original line number Diff line number Diff line
@@ -93,12 +93,9 @@ invalid_gunlock:
	if (!had_lock)
		gfs2_glock_dq_uninit(&d_gh);
invalid:
	if (inode && S_ISDIR(inode->i_mode)) {
		if (have_submounts(dentry))
	if (check_submounts_and_drop(dentry) != 0)
		goto valid;
		shrink_dcache_parent(dentry);
	}
	d_drop(dentry);

	dput(parent);
	return 0;