Commit c5392124 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Steven Whitehouse

[GFS2] More style changes

Remove redundant brackets
Signed-off-by: default avatarJan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 7b625361
...@@ -618,7 +618,7 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh, ...@@ -618,7 +618,7 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh,
return error; return error;
top = (u64 *)(bh->b_data + mh_size) + 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; bottom = (u64 *)(bh->b_data + mh_size) + sdp->sd_inptrs;
} }
...@@ -957,7 +957,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) ...@@ -957,7 +957,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size)
int error; int error;
error = gfs2_trans_begin(sdp, error = gfs2_trans_begin(sdp,
RES_DINODE + ((journaled) ? RES_JDATA : 0), 0); RES_DINODE + (journaled ? RES_JDATA : 0), 0);
if (error) if (error)
return error; return error;
......
...@@ -284,7 +284,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, ...@@ -284,7 +284,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf,
if (offset >= ip->i_di.di_size) if (offset >= ip->i_di.di_size)
return 0; 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; size = ip->i_di.di_size - offset;
if (!size) if (!size)
...@@ -399,7 +399,7 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent, ...@@ -399,7 +399,7 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent,
if (!dent->de_inum.no_addr) if (!dent->de_inum.no_addr)
actual = GFS2_DIRENT_SIZE(0); actual = GFS2_DIRENT_SIZE(0);
if ((totlen - actual) >= required) if (totlen - actual >= required)
return 1; return 1;
return 0; return 0;
} }
......
...@@ -342,8 +342,8 @@ static void log_pull_tail(struct gfs2_sbd *sdp, unsigned int new_tail, int pull) ...@@ -342,8 +342,8 @@ static void log_pull_tail(struct gfs2_sbd *sdp, unsigned int new_tail, int pull)
ail2_empty(sdp, new_tail); ail2_empty(sdp, new_tail);
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
sdp->sd_log_blks_free += dist - ((pull) ? 1 : 0); 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); */ /* 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, gfs2_assert_withdraw(sdp,
sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks); sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks);
gfs2_log_unlock(sdp); gfs2_log_unlock(sdp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment