From de312ab5a952a36a56f31072c3fe891cba172501 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Wed, 10 Mar 2010 18:10:19 -0600 Subject: [PATCH] --- yaml --- r: 187827 b: refs/heads/master c: 2e95e3f668c85276ce699993596d3b52b0fcf4c5 h: refs/heads/master i: 187825: eed277c93bf5c0fa135047f90f321777456a078c 187823: e42c1727cca2030a0875a96b02104d1b6423629d v: v3 --- [refs] | 2 +- trunk/fs/gfs2/incore.h | 2 +- trunk/fs/gfs2/log.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ae182b835d5e..2b18cebfdf18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9edb1d8a345119c9baafa1b240eb1ec06a44662 +refs/heads/master: 2e95e3f668c85276ce699993596d3b52b0fcf4c5 diff --git a/trunk/fs/gfs2/incore.h b/trunk/fs/gfs2/incore.h index b8025e51cabf..3aac46f6853e 100644 --- a/trunk/fs/gfs2/incore.h +++ b/trunk/fs/gfs2/incore.h @@ -616,7 +616,7 @@ struct gfs2_sbd { unsigned int sd_log_blks_reserved; unsigned int sd_log_commited_buf; unsigned int sd_log_commited_databuf; - unsigned int sd_log_commited_revoke; + int sd_log_commited_revoke; unsigned int sd_log_num_buf; unsigned int sd_log_num_revoke; diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c index 4511b08fc451..e5bf4b59d46e 100644 --- a/trunk/fs/gfs2/log.c +++ b/trunk/fs/gfs2/log.c @@ -417,7 +417,7 @@ static unsigned int calc_reserved(struct gfs2_sbd *sdp) databufhdrs_needed = (sdp->sd_log_commited_databuf + (dbuf_limit - 1)) / dbuf_limit; - if (sdp->sd_log_commited_revoke) + if (sdp->sd_log_commited_revoke > 0) revokes = gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke, sizeof(u64)); @@ -790,7 +790,6 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) gfs2_assert_withdraw(sdp, (((int)sdp->sd_log_commited_buf) >= 0) || (((int)sdp->sd_log_commited_databuf) >= 0)); sdp->sd_log_commited_revoke += tr->tr_num_revoke - tr->tr_num_revoke_rm; - gfs2_assert_withdraw(sdp, ((int)sdp->sd_log_commited_revoke) >= 0); reserved = calc_reserved(sdp); gfs2_assert_withdraw(sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved); unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved;