[GFS2] Patch to protect sd_log_num_jdata

This is a patch to GFS2 to protect sd_log_num_jdata with the
gfs2_log_lock.  Without this patch, there is a timing window
where you can get hit the following assert from function
gfs2_log_flush():

gfs2_assert_withdraw(sdp,
			sdp->sd_log_num_buf + sdp->sd_log_num_jdata ==
			sdp->sd_log_commited_buf +
			sdp->sd_log_commited_databuf);

I've tested it on my roth cluster and it fixes the problem.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index a0371f835cfb314dcfdd42a809294cfc9ebf2b9b..7ef33562337396ab1215e062e152c07dbb27eccf 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -492,11 +492,12 @@ static void databuf_lo_add(struct gfs2_sbd *sdp, struct gfs2_log_element *le)
 
        gfs2_trans_add_gl(bd->bd_gl);
        if (gfs2_is_jdata(ip)) {
-               sdp->sd_log_num_jdata++;
                gfs2_pin(sdp, bd->bd_bh);
                tr->tr_num_databuf_new++;
        }
        gfs2_log_lock(sdp);
+       if (gfs2_is_jdata(ip))
+               sdp->sd_log_num_jdata++;
        sdp->sd_log_num_databuf++;
        list_add(&le->le_list, &sdp->sd_log_le_databuf);
        gfs2_log_unlock(sdp);