Commit 9d9b1605 authored by Bob Peterson's avatar Bob Peterson
Browse files

gfs2: Fix glock recursion in freeze_go_xmote_bh 



We must not call gfs2_consist (which does a file system withdraw) from
the freeze glock's freeze_go_xmote_bh function because the withdraw
will try to use the freeze glock, thus causing a glock recursion error.

This patch changes freeze_go_xmote_bh to call function
gfs2_assert_withdraw_delayed instead of gfs2_consist to avoid recursion.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
parent a6579cbf

fs/gfs2/glops.c

+7 −10
Original line number Diff line number Diff line
@@ -610,17 +610,14 @@ static int freeze_go_xmote_bh(struct gfs2_glock *gl) 
		j_gl->gl_ops->go_inval(j_gl, DIO_METADATA);



		error = gfs2_find_jhead(sdp->sd_jdesc, &head, false);

		if (error)

			gfs2_consist(sdp);

		if (!(head.lh_flags & GFS2_LOG_HEAD_UNMOUNT))

			gfs2_consist(sdp);



		/*  Initialize some head of the log stuff  */

		if (!gfs2_withdrawn(sdp)) {

		if (gfs2_assert_withdraw_delayed(sdp, !error))

			return error;

		if (gfs2_assert_withdraw_delayed(sdp, head.lh_flags &

						 GFS2_LOG_HEAD_UNMOUNT))

			return -EIO;

		sdp->sd_log_sequence = head.lh_sequence + 1;

		gfs2_log_pointers_init(sdp, head.lh_blkno);

	}

	}

	return 0;

}