diff options
| -rw-r--r-- | fs/gfs2/bmap.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/dir.c | 4 | ||||
| -rw-r--r-- | fs/gfs2/log.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 0f9567fe5c8..57caad7bc0d 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -618,7 +618,7 @@ static int recursive_scan(struct gfs2_inode *ip, struct buffer_head *dibh, 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 @@ static int trunc_start(struct gfs2_inode *ip, u64 size) 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 d74a52bda54..f3dbda216ca 100644 --- a/fs/gfs2/dir.c +++ b/fs/gfs2/dir.c @@ -284,7 +284,7 @@ static int gfs2_dir_read_data(struct gfs2_inode *ip, char *buf, 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 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent, 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 382a19eea1c..8fce592f401 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -342,8 +342,8 @@ static void log_pull_tail(struct gfs2_sbd *sdp, unsigned int new_tail, int pull) 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); |