Эх сурвалжийг харах

[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>
Steven Whitehouse 18 жил өмнө
parent
commit
82ffa51637

+ 4 - 5
fs/gfs2/lops.c

@@ -118,7 +118,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
 	unsigned n;
 	unsigned n;
 	__be64 *ptr;
 	__be64 *ptr;
 
 
-	offset += (sizeof(__be64) - 1);
+	offset += sizeof(__be64) - 1;
 	offset &= ~(sizeof(__be64) - 1);
 	offset &= ~(sizeof(__be64) - 1);
 	limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
 	limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
 	/* for 4k blocks, limit = 503 */
 	/* for 4k blocks, limit = 503 */
@@ -219,8 +219,8 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
 			continue;
 			continue;
 
 
 		error = gfs2_replay_read_block(jd, start, &bh_log);
 		error = gfs2_replay_read_block(jd, start, &bh_log);
-                if (error)
-                        return error;
+		if (error)
+			return error;
 
 
 		bh_ip = gfs2_meta_new(gl, blkno);
 		bh_ip = gfs2_meta_new(gl, blkno);
 		memcpy(bh_ip->b_data, bh_log->b_data, bh_log->b_size);
 		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);
 	struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
 
 
 	if (error) {
 	if (error) {
-		gfs2_meta_sync(ip->i_gl,
-			       DIO_START | DIO_WAIT);
+		gfs2_meta_sync(ip->i_gl, DIO_START | DIO_WAIT);
 		return;
 		return;
 	}
 	}
 	if (pass != 1)
 	if (pass != 1)

+ 2 - 3
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;
 	bd->bd_gl = gl;
 
 
 	INIT_LIST_HEAD(&bd->bd_list_tr);
 	INIT_LIST_HEAD(&bd->bd_list_tr);
-	if (meta) {
+	if (meta)
 		lops_init_le(&bd->bd_le, &gfs2_buf_lops);
 		lops_init_le(&bd->bd_le, &gfs2_buf_lops);
-	} else {
+	else
 		lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
 		lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
-	}
 	bh->b_private = bd;
 	bh->b_private = bd;
 
 
 	if (meta)
 	if (meta)