From 9706548a73f094af5d6e9ff8ab431dcd6a22d45e Mon Sep 17 00:00:00 2001 From: Steven Whitehouse Date: Thu, 10 Jan 2008 14:49:43 +0000 Subject: [PATCH] --- yaml --- r: 76059 b: refs/heads/master c: ac39aadd0440ae696e6dacaa8006ce1737b17008 h: refs/heads/master i: 76057: ffc0b620d61ffadb03a47226643fcc97e13bdda5 76055: 7cc28de722980be3b9e18524651f670db9c280f9 v: v3 --- [refs] | 2 +- trunk/fs/gfs2/log.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 05f5f2b490ad..5f69c0fa436e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9656b2c14c6ee0806c90a6be41dec71117fc8f50 +refs/heads/master: ac39aadd0440ae696e6dacaa8006ce1737b17008 diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c index 91645259e135..161ab6f2058e 100644 --- a/trunk/fs/gfs2/log.c +++ b/trunk/fs/gfs2/log.c @@ -757,7 +757,7 @@ void __gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) { unsigned int reserved; - unsigned int old; + unsigned int unused; gfs2_log_lock(sdp); @@ -769,14 +769,11 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 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); - old = atomic_read(&sdp->sd_log_blks_free); - atomic_add(tr->tr_reserved - (reserved - sdp->sd_log_blks_reserved), - &sdp->sd_log_blks_free); - - gfs2_assert_withdraw(sdp, atomic_read(&sdp->sd_log_blks_free) >= old); + unused = sdp->sd_log_blks_reserved - reserved + tr->tr_reserved; + gfs2_assert_withdraw(sdp, unused >= 0); + atomic_add(unused, &sdp->sd_log_blks_free); gfs2_assert_withdraw(sdp, atomic_read(&sdp->sd_log_blks_free) <= sdp->sd_jdesc->jd_blocks); - sdp->sd_log_blks_reserved = reserved; gfs2_log_unlock(sdp);