From c2477599da19b27db3633314c9faefd7e769c336 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Thu, 17 Apr 2008 17:25:37 +0200
Subject: [PATCH] --- yaml --- r: 89537 b: refs/heads/master c:
 62be1f71677c53d5e51223807a06ac9052f49b0f h: refs/heads/master i:   89535:
 1b30842b794f12aa57c57ca7d33a80a458a4630a v: v3

---
 [refs]              | 2 +-
 trunk/fs/gfs2/log.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cdf816db051e..48c253d76cdc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16c5f06f15ad4e5a5d6e90b78ffb1ac14319e445
+refs/heads/master: 62be1f71677c53d5e51223807a06ac9052f49b0f
diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c
index b335304fc5d6..548264b1836d 100644
--- a/trunk/fs/gfs2/log.c
+++ b/trunk/fs/gfs2/log.c
@@ -769,8 +769,8 @@ 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);
+	gfs2_assert_withdraw(sdp, sdp->sd_log_blks_reserved + tr->tr_reserved >= reserved);
 	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);