aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 14:47:06 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 14:47:06 -0400
commit82ffa51637f9239aaddd3151fb0d41c657f760db (patch)
tree13f06a70337998d81a6053dda28e892a7a6fdfcc
parentc26687113aea9a11c6f23ddf668f1fe43eca4ce7 (diff)
[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>
-rw-r--r--fs/gfs2/lops.c9
-rw-r--r--fs/gfs2/meta_io.c5
2 files changed, 6 insertions, 8 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 456d6ad1049d..5898d6d3c1fe 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -118,7 +118,7 @@ static void buf_lo_before_commit(struct gfs2_sbd *sdp)
118 unsigned n; 118 unsigned n;
119 __be64 *ptr; 119 __be64 *ptr;
120 120
121 offset += (sizeof(__be64) - 1); 121 offset += sizeof(__be64) - 1;
122 offset &= ~(sizeof(__be64) - 1); 122 offset &= ~(sizeof(__be64) - 1);
123 limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64); 123 limit = (sdp->sd_sb.sb_bsize - offset)/sizeof(__be64);
124 /* for 4k blocks, limit = 503 */ 124 /* for 4k blocks, limit = 503 */
@@ -219,8 +219,8 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
219 continue; 219 continue;
220 220
221 error = gfs2_replay_read_block(jd, start, &bh_log); 221 error = gfs2_replay_read_block(jd, start, &bh_log);
222 if (error) 222 if (error)
223 return error; 223 return error;
224 224
225 bh_ip = gfs2_meta_new(gl, blkno); 225 bh_ip = gfs2_meta_new(gl, blkno);
226 memcpy(bh_ip->b_data, bh_log->b_data, bh_log->b_size); 226 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)
248 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode); 248 struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
249 249
250 if (error) { 250 if (error) {
251 gfs2_meta_sync(ip->i_gl, 251 gfs2_meta_sync(ip->i_gl, DIO_START | DIO_WAIT);
252 DIO_START | DIO_WAIT);
253 return; 252 return;
254 } 253 }
255 if (pass != 1) 254 if (pass != 1)
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 5b10379c20eb..6af3521339fc 100644
--- 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,
460 bd->bd_gl = gl; 460 bd->bd_gl = gl;
461 461
462 INIT_LIST_HEAD(&bd->bd_list_tr); 462 INIT_LIST_HEAD(&bd->bd_list_tr);
463 if (meta) { 463 if (meta)
464 lops_init_le(&bd->bd_le, &gfs2_buf_lops); 464 lops_init_le(&bd->bd_le, &gfs2_buf_lops);
465 } else { 465 else
466 lops_init_le(&bd->bd_le, &gfs2_databuf_lops); 466 lops_init_le(&bd->bd_le, &gfs2_databuf_lops);
467 }
468 bh->b_private = bd; 467 bh->b_private = bd;
469 468
470 if (meta) 469 if (meta)