Commit f4e2f5e1 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Grab glock reference sooner in gfs2_add_revoke 



This patch rearranges gfs2_add_revoke so that the extra glock
reference is added earlier on in the function to avoid races in which
the glock is freed before the new reference is taken.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent c9cb9e38

fs/gfs2/log.c

+3 −3
Original line number Diff line number Diff line
@@ -669,13 +669,13 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) 
	struct buffer_head *bh = bd->bd_bh;

	struct gfs2_glock *gl = bd->bd_gl;



	sdp->sd_log_num_revoke++;

	if (atomic_inc_return(&gl->gl_revokes) == 1)

		gfs2_glock_hold(gl);

	bh->b_private = NULL;

	bd->bd_blkno = bh->b_blocknr;

	gfs2_remove_from_ail(bd); /* drops ref on bh */

	bd->bd_bh = NULL;

	sdp->sd_log_num_revoke++;

	if (atomic_inc_return(&gl->gl_revokes) == 1)

		gfs2_glock_hold(gl);

	set_bit(GLF_LFLUSH, &gl->gl_flags);

	list_add(&bd->bd_list, &sdp->sd_log_revokes);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE