[GFS2] More style changes

As per Jan Engelhardt's fourth email, this is the first part of the
change set with a few minor style points.

Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 456d6ad1049d5135f835126f0354b48cec85c1bc..5898d6d3c1fefa48d9d1ed51f2051c65416c03c3 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -118,7 +118,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
        unsigned n;
        __be64 *ptr;
 
-       offset += (sizeof(__be64) - 1);
+       offset += sizeof(__be64) - 1;
        offset &= ~(sizeof(__be64) - 1);
        limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
        /* for 4k blocks, limit = 503 */
@@ -219,8 +219,8 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
                        continue;
 
                error = gfs2_replay_read_block(jd, start, &bh_log);
-                if (error)
-                        return error;
+               if (error)
+                       return error;
 
                bh_ip = gfs2_meta_new(gl, blkno);
                memcpy(bh_ip->b_data, bh_log->b_data, bh_log->b_size);
@@ -248,8 +248,7 @@ static void buf_lo_after_scan(struct gfs2_jdesc *jd, int error, int pass)
        struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
 
        if (error) {
-               gfs2_meta_sync(ip->i_gl,
-                              DIO_START | DIO_WAIT);
+               gfs2_meta_sync(ip->i_gl, DIO_START | DIO_WAIT);
                return;
        }
        if (pass != 1)

diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 5b10379c20ebb5ee3f2fe1d4dd9b6d6082b8b32c..6af3521339fc249cd81bf1b0712fa3cd6b2da575 100644 (file)
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -460,11 +460,10 @@ void gfs2_attach_bufdata(struct gfs2_glock *gl, struct buffer_head *bh,
        bd->bd_gl = gl;
 
        INIT_LIST_HEAD(&bd->bd_list_tr);
-       if (meta) {
+       if (meta)
                lops_init_le(&bd->bd_le, &gfs2_buf_lops);
-       } else {
+       else
                lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
-       }
        bh->b_private = bd;
 
        if (meta)