From: Eric Sandeen Date: Tue, 18 Sep 2012 02:50:31 +0000 (-0500) Subject: GFS2: fix s_writers.counter imbalance in gfs2_ail_empty_gl X-Git-Tag: upstream/snapshot3+hdmi~6626^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0b4df294387c777c3091a43e9970572e10261b1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git GFS2: fix s_writers.counter imbalance in gfs2_ail_empty_gl gfs2_ail_empty_gl() contains an "inline version" of gfs2_trans_begin(), so it needs an explicit sb_start_intwrite() as well, to balance the sb_end_intwrite() which will be called by gfs2_trans_end(). With this, xfstest 068 passes on lock_nolock local gfs2. Without it, we reach a writer count of -1 and get stuck. Signed-off-by: Eric Sandeen Signed-off-by: Steven Whitehouse --- diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 4bdcf37..32cc4fd 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c @@ -94,6 +94,7 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) /* A shortened, inline version of gfs2_trans_begin() */ tr.tr_reserved = 1 + gfs2_struct2blk(sdp, tr.tr_revokes, sizeof(u64)); tr.tr_ip = (unsigned long)__builtin_return_address(0); + sb_start_intwrite(sdp->sd_vfs); gfs2_log_reserve(sdp, tr.tr_reserved); BUG_ON(current->journal_info); current->journal_info = &tr;