From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Tue, 18 Sep 2012 09:18:46 +0100 Subject: [Cluster-devel] [PATCH] gfs2: fix s_writers.counter imbalance in gfs2_ail_empty_gl In-Reply-To: <5057E177.4050006@redhat.com> References: <5057E177.4050006@redhat.com> Message-ID: <1347956326.2725.3.camel@menhir> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, looks good. Thanks, I'll add it to the -nmw tree in due course, Steve. On Mon, 2012-09-17 at 21:50 -0500, Eric Sandeen wrote: > 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 > --- > > 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; >