aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@linux01.gwdg.de>2006-09-05 08:30:40 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-07 09:42:56 -0400
commitc53921248c79197befa7caa4c17b1af5c077a2c2 (patch)
treee446672af150784bee2ac92ccc991a62ed699cca
parent7b62536141927212158ab84ce2afda9319ae6f2d (diff)
[GFS2] More style changes
Remove redundant brackets Signed-off-by: Jan Engelhardt <jengelh@linux01.gwdg.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/bmap.c4
-rw-r--r--fs/gfs2/dir.c4
-rw-r--r--fs/gfs2/log.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
index 0f9567fe5c8b..57caad7bc0d5 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,
618 return error; 618 return error;
619 619
620 top = (u64 *)(bh->b_data + mh_size) + 620 top = (u64 *)(bh->b_data + mh_size) +
621 ((first) ? mp->mp_list[height] : 0); 621 (first ? mp->mp_list[height] : 0);
622 622
623 bottom = (u64 *)(bh->b_data + mh_size) + sdp->sd_inptrs; 623 bottom = (u64 *)(bh->b_data + mh_size) + sdp->sd_inptrs;
624 } 624 }
@@ -957,7 +957,7 @@ static int trunc_start(struct gfs2_inode *ip, u64 size)
957 int error; 957 int error;
958 958
959 error = gfs2_trans_begin(sdp, 959 error = gfs2_trans_begin(sdp,
960 RES_DINODE + ((journaled) ? RES_JDATA : 0), 0); 960 RES_DINODE + (journaled ? RES_JDATA : 0), 0);
961 if (error) 961 if (error)
962 return error; 962 return error;
963 963
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index d74a52bda540..f3dbda216caf 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,
284 if (offset >= ip->i_di.di_size) 284 if (offset >= ip->i_di.di_size)
285 return 0; 285 return 0;
286 286
287 if ((offset + size) > ip->i_di.di_size) 287 if (offset + size > ip->i_di.di_size)
288 size = ip->i_di.di_size - offset; 288 size = ip->i_di.di_size - offset;
289 289
290 if (!size) 290 if (!size)
@@ -399,7 +399,7 @@ static int gfs2_dirent_find_space(const struct gfs2_dirent *dent,
399 399
400 if (!dent->de_inum.no_addr) 400 if (!dent->de_inum.no_addr)
401 actual = GFS2_DIRENT_SIZE(0); 401 actual = GFS2_DIRENT_SIZE(0);
402 if ((totlen - actual) >= required) 402 if (totlen - actual >= required)
403 return 1; 403 return 1;
404 return 0; 404 return 0;
405} 405}
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index 382a19eea1c7..8fce592f4011 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)
342 ail2_empty(sdp, new_tail); 342 ail2_empty(sdp, new_tail);
343 343
344 gfs2_log_lock(sdp); 344 gfs2_log_lock(sdp);
345 sdp->sd_log_blks_free += dist - ((pull) ? 1 : 0); 345 sdp->sd_log_blks_free += dist - (pull ? 1 : 0);
346 /* printk(KERN_INFO "pull tail refunding %u blocks (%u left) pull=%d\n", dist - ((pull) ? 1 : 0), sdp->sd_log_blks_free, pull); */ 346 /* printk(KERN_INFO "pull tail refunding %u blocks (%u left) pull=%d\n", dist - (pull ? 1 : 0), sdp->sd_log_blks_free, pull); */
347 gfs2_assert_withdraw(sdp, 347 gfs2_assert_withdraw(sdp,
348 sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks); 348 sdp->sd_log_blks_free <= sdp->sd_jdesc->jd_blocks);
349 gfs2_log_unlock(sdp); 349 gfs2_log_unlock(sdp);