[GFS2] Fix journal off-by-one error

log_refund() incorrectly assumed that if a transaction had been touched, it
always committed buffers to the incore log. Thus, when you got around to
flushing the log, you would need one more block than you committed, to account
for the header. So it automatically set reserved to 1, which had the effect of
making sdp->sd_log_blks_reserved one greater when you got to gfs2_log_flush().
However, if you don't actually commit anything to the incore log between
flushes, you don't need the header, because you aren't writing anything out.
With this patch, log_refund() only increments reservered to account for the
header if something has been committed since the last flush.

Signed-off-by: Benjamin E. Marzinski <bmarzins@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index a591fb8fae20ab7bf22cd7e1f76bf60f4e61c99c..af728cb3b3278e55f2c6dac3fdced93c2ed89195 100644 (file)
--- a/fs/gfs2/log.c
+++ b/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 -