aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2006-01-11 04:50:22 -0500
committerNathan Scott <nathans@sgi.com>2006-01-11 04:50:22 -0500
commit204ab25f36fbd44a24458c0227cf2629c8caf00d (patch)
treedf4121663a00f4a2573444e99a0f89e23c48ffbc
parentda7f93e9eec0885317351eb8a20cc550ed48f470 (diff)
[XFS] Fix up offset type inconsistencies and gcc warnings from earlier
changes. SGI-PV: 947038 SGI-Modid: xfs-linux-melb:xfs-kern:24875a Signed-off-by: Nathan Scott <nathans@sgi.com>
-rw-r--r--fs/xfs/linux-2.6/xfs_buf.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 6282f034b269..e44b7c1a3a36 100644
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
@@ -223,7 +223,7 @@ STATIC void
223_xfs_buf_initialize( 223_xfs_buf_initialize(
224 xfs_buf_t *bp, 224 xfs_buf_t *bp,
225 xfs_buftarg_t *target, 225 xfs_buftarg_t *target,
226 loff_t range_base, 226 xfs_off_t range_base,
227 size_t range_length, 227 size_t range_length,
228 xfs_buf_flags_t flags) 228 xfs_buf_flags_t flags)
229{ 229{
@@ -348,7 +348,7 @@ _xfs_buf_lookup_pages(
348 gfp_t gfp_mask = xb_to_gfp(flags); 348 gfp_t gfp_mask = xb_to_gfp(flags);
349 unsigned short page_count, i; 349 unsigned short page_count, i;
350 pgoff_t first; 350 pgoff_t first;
351 loff_t end; 351 xfs_off_t end;
352 int error; 352 int error;
353 353
354 end = bp->b_file_offset + bp->b_buffer_length; 354 end = bp->b_file_offset + bp->b_buffer_length;
@@ -467,12 +467,12 @@ _xfs_buf_map_pages(
467xfs_buf_t * 467xfs_buf_t *
468_xfs_buf_find( 468_xfs_buf_find(
469 xfs_buftarg_t *btp, /* block device target */ 469 xfs_buftarg_t *btp, /* block device target */
470 loff_t ioff, /* starting offset of range */ 470 xfs_off_t ioff, /* starting offset of range */
471 size_t isize, /* length of range */ 471 size_t isize, /* length of range */
472 xfs_buf_flags_t flags, 472 xfs_buf_flags_t flags,
473 xfs_buf_t *new_bp) 473 xfs_buf_t *new_bp)
474{ 474{
475 loff_t range_base; 475 xfs_off_t range_base;
476 size_t range_length; 476 size_t range_length;
477 xfs_bufhash_t *hash; 477 xfs_bufhash_t *hash;
478 xfs_buf_t *bp, *n; 478 xfs_buf_t *bp, *n;
@@ -482,7 +482,7 @@ _xfs_buf_find(
482 482
483 /* Check for IOs smaller than the sector size / not sector aligned */ 483 /* Check for IOs smaller than the sector size / not sector aligned */
484 ASSERT(!(range_length < (1 << btp->bt_sshift))); 484 ASSERT(!(range_length < (1 << btp->bt_sshift)));
485 ASSERT(!(range_base & (loff_t)btp->bt_smask)); 485 ASSERT(!(range_base & (xfs_off_t)btp->bt_smask));
486 486
487 hash = &btp->bt_hash[hash_long((unsigned long)ioff, btp->bt_hashshift)]; 487 hash = &btp->bt_hash[hash_long((unsigned long)ioff, btp->bt_hashshift)];
488 488
@@ -561,7 +561,7 @@ found:
561xfs_buf_t * 561xfs_buf_t *
562xfs_buf_get_flags( 562xfs_buf_get_flags(
563 xfs_buftarg_t *target,/* target for buffer */ 563 xfs_buftarg_t *target,/* target for buffer */
564 loff_t ioff, /* starting offset of range */ 564 xfs_off_t ioff, /* starting offset of range */
565 size_t isize, /* length of range */ 565 size_t isize, /* length of range */
566 xfs_buf_flags_t flags) 566 xfs_buf_flags_t flags)
567{ 567{
@@ -617,7 +617,7 @@ xfs_buf_get_flags(
617xfs_buf_t * 617xfs_buf_t *
618xfs_buf_read_flags( 618xfs_buf_read_flags(
619 xfs_buftarg_t *target, 619 xfs_buftarg_t *target,
620 loff_t ioff, 620 xfs_off_t ioff,
621 size_t isize, 621 size_t isize,
622 xfs_buf_flags_t flags) 622 xfs_buf_flags_t flags)
623{ 623{
@@ -661,7 +661,7 @@ xfs_buf_read_flags(
661void 661void
662xfs_buf_readahead( 662xfs_buf_readahead(
663 xfs_buftarg_t *target, 663 xfs_buftarg_t *target,
664 loff_t ioff, 664 xfs_off_t ioff,
665 size_t isize, 665 size_t isize,
666 xfs_buf_flags_t flags) 666 xfs_buf_flags_t flags)
667{ 667{