gfs2: Minor calc_reserved cleanup

No functional change. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

gfs2: Minor calc_reserved cleanup
No functional change. Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
71b219f4 · Andreas Gruenbacher · 76fce654 · 71b219f4
Commit 71b219f4 authored Jan 29, 2021 by Andreas Gruenbacher
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 8 deletions

fs/gfs2/log.c fs/gfs2/log.c +5 -8

No files found.
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -546,17 +546,14 @@ static inline unsigned int log_distance(struct gfs2_sbd *sdp, unsigned int newer
 static unsigned int calc_reserved(struct gfs2_sbd *sdp)
 {
 	unsigned int reserved = 0;
-	unsigned int mbuf;
+	unsigned int blocks;
-	unsigned int dbuf;
 	struct gfs2_trans *tr = sdp->sd_log_tr;
 	if (tr) {
-		mbuf = tr->tr_num_buf_new - tr->tr_num_buf_rm;
+		blocks = tr->tr_num_buf_new - tr->tr_num_buf_rm;
-		dbuf = tr->tr_num_databuf_new - tr->tr_num_databuf_rm;
+		reserved += blocks + DIV_ROUND_UP(blocks, buf_limit(sdp));
-		reserved = mbuf + dbuf;
+		blocks = tr->tr_num_databuf_new - tr->tr_num_databuf_rm;
-		/* Account for header blocks */
+		reserved += blocks + DIV_ROUND_UP(blocks, databuf_limit(sdp));
-		reserved += DIV_ROUND_UP(mbuf, buf_limit(sdp));
-		reserved += DIV_ROUND_UP(dbuf, databuf_limit(sdp));
 	}
 	if (sdp->sd_log_committed_revoke > 0)