Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ec217e0ece60f2240772e6f08e0529775846c627
Commit:     ec217e0ece60f2240772e6f08e0529775846c627
Parent:     a947e0335699a1d387c3826e5b8eff9e0afe505e
Author:     Bob Peterson <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 22 11:15:29 2007 -0500
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 08:55:43 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
 fs/gfs2/lops.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index a0371f8..7ef3356 100644
--- 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to