aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorNathan Scott <nathans@sgi.com>2005-05-05 16:33:40 -0400
committerChristoph Hellwig <hch@melbourne.sgi.com>2005-05-05 16:33:40 -0400
commitf403b7f452e4347f6af14c1f3c47bce758eb6337 (patch)
tree293a62e61b9cde904cda0a034c9ed91818c7764e /fs
parent24e17b5fb99d4d1b47fe0847a3a801e36d431ff6 (diff)
[XFS] Cleanup use of loff_t vs xfs_off_t in the core code.
SGI Modid: xfs-linux:xfs-kern:22378a Signed-off-by: Nathan Scott <nathans@sgi.com> Signed-off-by: Christoph Hellwig <hch@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_dfrag.c2
-rw-r--r--fs/xfs/xfs_iomap.c8
-rw-r--r--fs/xfs/xfs_iomap.h20
-rw-r--r--fs/xfs/xfs_mount.h8
4 files changed, 19 insertions, 19 deletions
diff --git a/fs/xfs/xfs_dfrag.c b/fs/xfs/xfs_dfrag.c
index 08d551a17347..63abdc2ac7f4 100644
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
@@ -182,7 +182,7 @@ xfs_swapext(
182 182
183 if (VN_CACHED(tvp) != 0) 183 if (VN_CACHED(tvp) != 0)
184 xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore), 184 xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore),
185 (loff_t)0, 0, 0); 185 (xfs_off_t)0, 0, 0);
186 186
187 /* Verify O_DIRECT for ftmp */ 187 /* Verify O_DIRECT for ftmp */
188 if (VN_CACHED(tvp) != 0) { 188 if (VN_CACHED(tvp) != 0) {
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index b291a2b53579..991f8a61f7c4 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -366,7 +366,7 @@ xfs_flush_space(
366int 366int
367xfs_iomap_write_direct( 367xfs_iomap_write_direct(
368 xfs_inode_t *ip, 368 xfs_inode_t *ip,
369 loff_t offset, 369 xfs_off_t offset,
370 size_t count, 370 size_t count,
371 int flags, 371 int flags,
372 xfs_bmbt_irec_t *ret_imap, 372 xfs_bmbt_irec_t *ret_imap,
@@ -542,7 +542,7 @@ error_out:
542int 542int
543xfs_iomap_write_delay( 543xfs_iomap_write_delay(
544 xfs_inode_t *ip, 544 xfs_inode_t *ip,
545 loff_t offset, 545 xfs_off_t offset,
546 size_t count, 546 size_t count,
547 int ioflag, 547 int ioflag,
548 xfs_bmbt_irec_t *ret_imap, 548 xfs_bmbt_irec_t *ret_imap,
@@ -747,7 +747,7 @@ write_map:
747int 747int
748xfs_iomap_write_allocate( 748xfs_iomap_write_allocate(
749 xfs_inode_t *ip, 749 xfs_inode_t *ip,
750 loff_t offset, 750 xfs_off_t offset,
751 size_t count, 751 size_t count,
752 xfs_bmbt_irec_t *map, 752 xfs_bmbt_irec_t *map,
753 int *retmap) 753 int *retmap)
@@ -901,7 +901,7 @@ error0:
901int 901int
902xfs_iomap_write_unwritten( 902xfs_iomap_write_unwritten(
903 xfs_inode_t *ip, 903 xfs_inode_t *ip,
904 loff_t offset, 904 xfs_off_t offset,
905 size_t count) 905 size_t count)
906{ 906{
907 xfs_mount_t *mp = ip->i_mount; 907 xfs_mount_t *mp = ip->i_mount;
diff --git a/fs/xfs/xfs_iomap.h b/fs/xfs/xfs_iomap.h
index 287895a3adc1..4daaa5212102 100644
--- a/fs/xfs/xfs_iomap.h
+++ b/fs/xfs/xfs_iomap.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2003,2004 Silicon Graphics, Inc. All Rights Reserved. 2 * Copyright (c) 2003-2005 Silicon Graphics, Inc. All Rights Reserved.
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify it 4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms of version 2 of the GNU General Public License as 5 * under the terms of version 2 of the GNU General Public License as
@@ -64,13 +64,13 @@ typedef enum {
64/* 64/*
65 * xfs_iomap_t: File system I/O map 65 * xfs_iomap_t: File system I/O map
66 * 66 *
67 * The iomap_bn field is expressed in 512-byte blocks, and is where the 67 * The iomap_bn field is expressed in 512-byte blocks, and is where the
68 * mapping starts on disk. 68 * mapping starts on disk.
69 * 69 *
70 * The iomap_offset, iomap_bsize and iomap_delta fields are in bytes. 70 * The iomap_offset, iomap_bsize and iomap_delta fields are in bytes.
71 * iomap_offset is the offset of the mapping in the file itself. 71 * iomap_offset is the offset of the mapping in the file itself.
72 * iomap_bsize is the size of the mapping, iomap_delta is the 72 * iomap_bsize is the size of the mapping, iomap_delta is the
73 * desired data's offset into the mapping, given the offset supplied 73 * desired data's offset into the mapping, given the offset supplied
74 * to the file I/O map routine. 74 * to the file I/O map routine.
75 * 75 *
76 * When a request is made to read beyond the logical end of the object, 76 * When a request is made to read beyond the logical end of the object,
@@ -81,8 +81,8 @@ typedef enum {
81typedef struct xfs_iomap { 81typedef struct xfs_iomap {
82 xfs_daddr_t iomap_bn; /* first 512b blk of mapping */ 82 xfs_daddr_t iomap_bn; /* first 512b blk of mapping */
83 xfs_buftarg_t *iomap_target; 83 xfs_buftarg_t *iomap_target;
84 loff_t iomap_offset; /* offset of mapping, bytes */ 84 xfs_off_t iomap_offset; /* offset of mapping, bytes */
85 loff_t iomap_bsize; /* size of mapping, bytes */ 85 xfs_off_t iomap_bsize; /* size of mapping, bytes */
86 size_t iomap_delta; /* offset into mapping, bytes */ 86 size_t iomap_delta; /* offset into mapping, bytes */
87 iomap_flags_t iomap_flags; 87 iomap_flags_t iomap_flags;
88} xfs_iomap_t; 88} xfs_iomap_t;
@@ -93,12 +93,12 @@ struct xfs_bmbt_irec;
93 93
94extern int xfs_iomap(struct xfs_iocore *, xfs_off_t, ssize_t, int, 94extern int xfs_iomap(struct xfs_iocore *, xfs_off_t, ssize_t, int,
95 struct xfs_iomap *, int *); 95 struct xfs_iomap *, int *);
96extern int xfs_iomap_write_direct(struct xfs_inode *, loff_t, size_t, 96extern int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
97 int, struct xfs_bmbt_irec *, int *, int); 97 int, struct xfs_bmbt_irec *, int *, int);
98extern int xfs_iomap_write_delay(struct xfs_inode *, loff_t, size_t, int, 98extern int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
99 struct xfs_bmbt_irec *, int *); 99 struct xfs_bmbt_irec *, int *);
100extern int xfs_iomap_write_allocate(struct xfs_inode *, loff_t, size_t, 100extern int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
101 struct xfs_bmbt_irec *, int *); 101 struct xfs_bmbt_irec *, int *);
102extern int xfs_iomap_write_unwritten(struct xfs_inode *, loff_t, size_t); 102extern int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
103 103
104#endif /* __XFS_IOMAP_H__*/ 104#endif /* __XFS_IOMAP_H__*/
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h
index 8ffb65dc110d..30dd08fb9f57 100644
--- a/fs/xfs/xfs_mount.h
+++ b/fs/xfs/xfs_mount.h
@@ -210,16 +210,16 @@ typedef int (*xfs_bmapi_t)(struct xfs_trans *, void *,
210 struct xfs_bmap_free *); 210 struct xfs_bmap_free *);
211typedef int (*xfs_bmap_eof_t)(void *, xfs_fileoff_t, int, int *); 211typedef int (*xfs_bmap_eof_t)(void *, xfs_fileoff_t, int, int *);
212typedef int (*xfs_iomap_write_direct_t)( 212typedef int (*xfs_iomap_write_direct_t)(
213 void *, loff_t, size_t, int, 213 void *, xfs_off_t, size_t, int,
214 struct xfs_bmbt_irec *, int *, int); 214 struct xfs_bmbt_irec *, int *, int);
215typedef int (*xfs_iomap_write_delay_t)( 215typedef int (*xfs_iomap_write_delay_t)(
216 void *, loff_t, size_t, int, 216 void *, xfs_off_t, size_t, int,
217 struct xfs_bmbt_irec *, int *); 217 struct xfs_bmbt_irec *, int *);
218typedef int (*xfs_iomap_write_allocate_t)( 218typedef int (*xfs_iomap_write_allocate_t)(
219 void *, loff_t, size_t, 219 void *, xfs_off_t, size_t,
220 struct xfs_bmbt_irec *, int *); 220 struct xfs_bmbt_irec *, int *);
221typedef int (*xfs_iomap_write_unwritten_t)( 221typedef int (*xfs_iomap_write_unwritten_t)(
222 void *, loff_t, size_t); 222 void *, xfs_off_t, size_t);
223typedef uint (*xfs_lck_map_shared_t)(void *); 223typedef uint (*xfs_lck_map_shared_t)(void *);
224typedef void (*xfs_lock_t)(void *, uint); 224typedef void (*xfs_lock_t)(void *, uint);
225typedef void (*xfs_lock_demote_t)(void *, uint); 225typedef void (*xfs_lock_demote_t)(void *, uint);