From 32b8e7831a11f1bc235f05114389dfce62f4ef47 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Thu, 24 Aug 2006 14:47:17 -0500 Subject: [PATCH] --- yaml --- r: 38800 b: refs/heads/master c: 5dc39fe621ead2fa2a0439a686be4df185861eae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/gfs2/log.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 883622758a8d..4f0b1a514865 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2242db0906445491d9ac50bfa756b0de0a25d45 +refs/heads/master: 5dc39fe621ead2fa2a0439a686be4df185861eae diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c index a591fb8fae20..af728cb3b327 100644 --- a/trunk/fs/gfs2/log.c +++ b/trunk/fs/gfs2/log.c @@ -509,7 +509,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 = 1; + unsigned int reserved = 0; unsigned int old; gfs2_log_lock(sdp); @@ -524,6 +524,8 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) if (sdp->sd_log_commited_revoke) reserved += gfs2_struct2blk(sdp, sdp->sd_log_commited_revoke, sizeof(uint64_t)); + if (reserved) + reserved++; old = sdp->sd_log_blks_free; sdp->sd_log_blks_free += tr->tr_reserved -