summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2012-09-17 21:50:31 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2012-09-24 10:47:29 +0100
commita0b4df294387c777c3091a43e9970572e10261b1 (patch)
tree11526c24ae007ba3b8d3cc0bd5430546f10a56be /fs/gfs2
parent3701530aed9711fcfe9b29d3de0f7a27c8dbc8ae (diff)
downloadop-kernel-dev-a0b4df294387c777c3091a43e9970572e10261b1.zip
op-kernel-dev-a0b4df294387c777c3091a43e9970572e10261b1.tar.gz
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 <sandeen@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/glops.c1
1 files changed, 1 insertions, 0 deletions
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;
OpenPOWER on IntegriCloud