3 files changed, 4 insertions, 14 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 571389012874..382a19eea1c7 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -177,7 +177,6 @@ int gfs2_log_reserve(struct gfs2_sbd *sdp, unsigned int blks)
 		gfs2_log_lock(sdp);
 	}
 	sdp->sd_log_blks_free -= blks;
-	/* printk(KERN_INFO "reserved %u blocks (%u left)\n", blks, sdp->sd_log_blks_free); */
 	gfs2_log_unlock(sdp);
 	mutex_unlock(&sdp->sd_log_reserve_mutex);
 
@@ -198,7 +197,6 @@ void gfs2_log_release(struct gfs2_sbd *sdp, unsigned int blks)
 
 	gfs2_log_lock(sdp);
 	sdp->sd_log_blks_free += blks;
-	/* printk(KERN_INFO "released %u blocks (%u left)\n", blks, sdp->sd_log_blks_free); */
 	gfs2_assert_withdraw(sdp,
 			     sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks);
 	gfs2_log_unlock(sdp);
@@ -213,9 +211,8 @@ static u64 log_bmap(struct gfs2_sbd *sdp, unsigned int lbn)
 	int bdy;
 
 	error = gfs2_block_map(sdp->sd_jdesc->jd_inode, lbn, &new, &dbn, &bdy);
-	if (!(!error && dbn)) {
+	if (error || !dbn)
 		printk(KERN_INFO "error=%d, dbn=%llu lbn=%u", error, (unsigned long long)dbn, lbn);
-	}
 	gfs2_assert_withdraw(sdp, !error && dbn);
 
 	return dbn;
@@ -414,13 +411,6 @@ static void log_flush_commit(struct gfs2_sbd *sdp)
 	struct list_head *head = &sdp->sd_log_flush_list;
 	struct gfs2_log_buf *lb;
 	struct buffer_head *bh;
-#if 0
-	unsigned int d;
-
-	d = log_distance(sdp, sdp->sd_log_flush_head, sdp->sd_log_head);
-
-	gfs2_assert_withdraw(sdp, d + 1 == sdp->sd_log_blks_reserved);
-#endif
 
 	while (!list_empty(head)) {
 		lb = list_entry(head->next, struct gfs2_log_buf, lb_list);
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 07655a755619..f8f6d4b56a01 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -518,7 +518,7 @@ static void databuf_lo_before_commit(struct gfs2_sbd *sdp)
 	unsigned int num, n;
 	__be64 *ptr = NULL;
 
-	offset += (2*sizeof(__be64) - 1);
+	offset += 2*sizeof(__be64) - 1;
 	offset &= ~(2*sizeof(__be64) - 1);
 	limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
 
diff --git a/fs/gfs2/recovery.c b/fs/gfs2/recovery.c
index ab55191926c3..a27569c5d85e 100644
--- a/fs/gfs2/recovery.c
+++ b/fs/gfs2/recovery.c
@@ -306,8 +306,8 @@ static int foreach_descriptor(struct gfs2_jdesc *jd, unsigned int start,
 	u32 length;
 	__be64 *ptr;
 	unsigned int offset = sizeof(struct gfs2_log_descriptor);
-	offset += (sizeof(__be64)-1);
-	offset &= ~(sizeof(__be64)-1);
+	offset += sizeof(__be64) - 1;
+	offset &= ~(sizeof(__be64) - 1);
 
 	while (start != end) {
 		error = gfs2_replay_read_block(jd, start, &bh);