[GFS2] More style changes
Remove redundant brackets
Signed-off-by: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 0f9567f..57caad7 100644
--- a/fs/gfs2/bmap.c
+++ b/fs/gfs2/bmap.c
@@ -618,7 +618,7 @@
return error;
top = (u64 *)(bh->b_data + mh_size) +
- ((first) ? mp->mp_list[height] : 0);
+ (first ? mp->mp_list[height] : 0);
bottom = (u64 *)(bh->b_data + mh_size) + sdp->sd_inptrs;
}
@@ -957,7 +957,7 @@
int error;
error = gfs2_trans_begin(sdp,
- RES_DINODE + ((journaled) ? RES_JDATA : 0), 0);
+ RES_DINODE + (journaled ? RES_JDATA : 0), 0);
if (error)
return error;
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index d74a52b..f3dbda2 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -284,7 +284,7 @@
if (offset >= ip->i_di.di_size)
return 0;
- if ((offset + size) > ip->i_di.di_size)
+ if (offset + size > ip->i_di.di_size)
size = ip->i_di.di_size - offset;
if (!size)
@@ -399,7 +399,7 @@
if (!dent->de_inum.no_addr)
actual = GFS2_DIRENT_SIZE(0);
- if ((totlen - actual) >= required)
+ if (totlen - actual >= required)
return 1;
return 0;
}
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 382a19e..8fce592 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -342,8 +342,8 @@
ail2_empty(sdp, new_tail);
gfs2_log_lock(sdp);
- sdp->sd_log_blks_free += dist - ((pull) ? 1 : 0);
- /* printk(KERN_INFO "pull tail refunding %u blocks (%u left) pull=%d\n", dist - ((pull) ? 1 : 0), sdp->sd_log_blks_free, pull); */
+ sdp->sd_log_blks_free += dist - (pull ? 1 : 0);
+ /* printk(KERN_INFO "pull tail refunding %u blocks (%u left) pull=%d\n", dist - (pull ? 1 : 0), sdp->sd_log_blks_free, pull); */
gfs2_assert_withdraw(sdp,
sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks);
gfs2_log_unlock(sdp);