Commit 52f341cf authored by Abhijith Das's avatar Abhijith Das Committed by Steven Whitehouse
Browse files

[GFS2] gfs2_set_flags double locking patch 



traced the "umount hang due to spurious glock" issue that I was having
with gfs2meta. It's in the do_gfs2_set_flags function, which does a
gfs2_holder_init as well as a gfs2_glock_nq_init (increases ref count by
2 instead of 1).

Signed-off-by: default avatarAbhijith Das <adas@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent c5921fd0

fs/gfs2/ops_file.c

+1 −4
Original line number Diff line number Diff line
@@ -608,12 +608,9 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) 
	int error;

	u32 new_flags, flags;



	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);

	error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);

	if (error) {

		gfs2_holder_uninit(&gh);

	if (error)

		return error;

	}



	flags = ip->i_di.di_flags;

	new_flags = (flags & ~mask) | (reqflags & mask);