aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lops.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:49:07 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 12:49:07 -0400
commitcd915493fce912f1bd838ee1250737ecf33b8fae (patch)
treee14ec6643de91f473edb26a89905e710596fe6bc /fs/gfs2/lops.c
parenta91ea69ffd3f8a0b7139bfd44042ab384461e631 (diff)
[GFS2] Change all types to uX style
This makes all fixed size types have consistent names. Cc: Jan Engelhardt <jengelh@linux01.gwdg.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/lops.c')
-rw-r--r--fs/gfs2/lops.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index e2c2582c8f6e..456d6ad1049d 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -202,7 +202,7 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
202 struct gfs2_glock *gl = ip->i_gl; 202 struct gfs2_glock *gl = ip->i_gl;
203 unsigned int blks = be32_to_cpu(ld->ld_data1); 203 unsigned int blks = be32_to_cpu(ld->ld_data1);
204 struct buffer_head *bh_log, *bh_ip; 204 struct buffer_head *bh_log, *bh_ip;
205 uint64_t blkno; 205 u64 blkno;
206 int error = 0; 206 int error = 0;
207 207
208 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA) 208 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA)
@@ -294,7 +294,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
294 ld->ld_header.mh_format = cpu_to_be32(GFS2_FORMAT_LD); 294 ld->ld_header.mh_format = cpu_to_be32(GFS2_FORMAT_LD);
295 ld->ld_type = cpu_to_be32(GFS2_LOG_DESC_REVOKE); 295 ld->ld_type = cpu_to_be32(GFS2_LOG_DESC_REVOKE);
296 ld->ld_length = cpu_to_be32(gfs2_struct2blk(sdp, sdp->sd_log_num_revoke, 296 ld->ld_length = cpu_to_be32(gfs2_struct2blk(sdp, sdp->sd_log_num_revoke,
297 sizeof(uint64_t))); 297 sizeof(u64)));
298 ld->ld_data1 = cpu_to_be32(sdp->sd_log_num_revoke); 298 ld->ld_data1 = cpu_to_be32(sdp->sd_log_num_revoke);
299 ld->ld_data2 = cpu_to_be32(0); 299 ld->ld_data2 = cpu_to_be32(0);
300 memset(ld->ld_reserved, 0, sizeof(ld->ld_reserved)); 300 memset(ld->ld_reserved, 0, sizeof(ld->ld_reserved));
@@ -305,7 +305,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
305 list_del_init(&rv->rv_le.le_list); 305 list_del_init(&rv->rv_le.le_list);
306 sdp->sd_log_num_revoke--; 306 sdp->sd_log_num_revoke--;
307 307
308 if (offset + sizeof(uint64_t) > sdp->sd_sb.sb_bsize) { 308 if (offset + sizeof(u64) > sdp->sd_sb.sb_bsize) {
309 set_buffer_dirty(bh); 309 set_buffer_dirty(bh);
310 ll_rw_block(WRITE, 1, &bh); 310 ll_rw_block(WRITE, 1, &bh);
311 311
@@ -320,7 +320,7 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp)
320 *(__be64 *)(bh->b_data + offset) = cpu_to_be64(rv->rv_blkno); 320 *(__be64 *)(bh->b_data + offset) = cpu_to_be64(rv->rv_blkno);
321 kfree(rv); 321 kfree(rv);
322 322
323 offset += sizeof(uint64_t); 323 offset += sizeof(u64);
324 } 324 }
325 gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke); 325 gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);
326 326
@@ -349,7 +349,7 @@ static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
349 unsigned int revokes = be32_to_cpu(ld->ld_data1); 349 unsigned int revokes = be32_to_cpu(ld->ld_data1);
350 struct buffer_head *bh; 350 struct buffer_head *bh;
351 unsigned int offset; 351 unsigned int offset;
352 uint64_t blkno; 352 u64 blkno;
353 int first = 1; 353 int first = 1;
354 int error; 354 int error;
355 355
@@ -366,7 +366,7 @@ static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
366 if (!first) 366 if (!first)
367 gfs2_metatype_check(sdp, bh, GFS2_METATYPE_LB); 367 gfs2_metatype_check(sdp, bh, GFS2_METATYPE_LB);
368 368
369 while (offset + sizeof(uint64_t) <= sdp->sd_sb.sb_bsize) { 369 while (offset + sizeof(u64) <= sdp->sd_sb.sb_bsize) {
370 blkno = be64_to_cpu(*(__be64 *)(bh->b_data + offset)); 370 blkno = be64_to_cpu(*(__be64 *)(bh->b_data + offset));
371 371
372 error = gfs2_revoke_add(sdp, blkno, start); 372 error = gfs2_revoke_add(sdp, blkno, start);
@@ -377,7 +377,7 @@ static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
377 377
378 if (!--revokes) 378 if (!--revokes)
379 break; 379 break;
380 offset += sizeof(uint64_t); 380 offset += sizeof(u64);
381 } 381 }
382 382
383 brelse(bh); 383 brelse(bh);
@@ -677,8 +677,8 @@ static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
677 struct gfs2_glock *gl = ip->i_gl; 677 struct gfs2_glock *gl = ip->i_gl;
678 unsigned int blks = be32_to_cpu(ld->ld_data1); 678 unsigned int blks = be32_to_cpu(ld->ld_data1);
679 struct buffer_head *bh_log, *bh_ip; 679 struct buffer_head *bh_log, *bh_ip;
680 uint64_t blkno; 680 u64 blkno;
681 uint64_t esc; 681 u64 esc;
682 int error = 0; 682 int error = 0;
683 683
684 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA) 684 if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA)