diff --git a/[refs] b/[refs] index e66adf41a762..1d7cd3fb7c80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a947e0335699a1d387c3826e5b8eff9e0afe505e +refs/heads/master: ec217e0ece60f2240772e6f08e0529775846c627 diff --git a/trunk/fs/gfs2/lops.c b/trunk/fs/gfs2/lops.c index a0371f835cfb..7ef335623373 100644 --- a/trunk/fs/gfs2/lops.c +++ b/trunk/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);