mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
[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>
This commit is contained in:
parent
24e17b5fb9
commit
f403b7f452
4 changed files with 19 additions and 19 deletions
|
@ -182,7 +182,7 @@ xfs_swapext(
|
||||||
|
|
||||||
if (VN_CACHED(tvp) != 0)
|
if (VN_CACHED(tvp) != 0)
|
||||||
xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore),
|
xfs_inval_cached_pages(XFS_ITOV(tip), &(tip->i_iocore),
|
||||||
(loff_t)0, 0, 0);
|
(xfs_off_t)0, 0, 0);
|
||||||
|
|
||||||
/* Verify O_DIRECT for ftmp */
|
/* Verify O_DIRECT for ftmp */
|
||||||
if (VN_CACHED(tvp) != 0) {
|
if (VN_CACHED(tvp) != 0) {
|
||||||
|
|
|
@ -366,7 +366,7 @@ xfs_flush_space(
|
||||||
int
|
int
|
||||||
xfs_iomap_write_direct(
|
xfs_iomap_write_direct(
|
||||||
xfs_inode_t *ip,
|
xfs_inode_t *ip,
|
||||||
loff_t offset,
|
xfs_off_t offset,
|
||||||
size_t count,
|
size_t count,
|
||||||
int flags,
|
int flags,
|
||||||
xfs_bmbt_irec_t *ret_imap,
|
xfs_bmbt_irec_t *ret_imap,
|
||||||
|
@ -542,7 +542,7 @@ xfs_iomap_write_direct(
|
||||||
int
|
int
|
||||||
xfs_iomap_write_delay(
|
xfs_iomap_write_delay(
|
||||||
xfs_inode_t *ip,
|
xfs_inode_t *ip,
|
||||||
loff_t offset,
|
xfs_off_t offset,
|
||||||
size_t count,
|
size_t count,
|
||||||
int ioflag,
|
int ioflag,
|
||||||
xfs_bmbt_irec_t *ret_imap,
|
xfs_bmbt_irec_t *ret_imap,
|
||||||
|
@ -747,7 +747,7 @@ xfs_iomap_write_delay(
|
||||||
int
|
int
|
||||||
xfs_iomap_write_allocate(
|
xfs_iomap_write_allocate(
|
||||||
xfs_inode_t *ip,
|
xfs_inode_t *ip,
|
||||||
loff_t offset,
|
xfs_off_t offset,
|
||||||
size_t count,
|
size_t count,
|
||||||
xfs_bmbt_irec_t *map,
|
xfs_bmbt_irec_t *map,
|
||||||
int *retmap)
|
int *retmap)
|
||||||
|
@ -901,7 +901,7 @@ xfs_iomap_write_allocate(
|
||||||
int
|
int
|
||||||
xfs_iomap_write_unwritten(
|
xfs_iomap_write_unwritten(
|
||||||
xfs_inode_t *ip,
|
xfs_inode_t *ip,
|
||||||
loff_t offset,
|
xfs_off_t offset,
|
||||||
size_t count)
|
size_t count)
|
||||||
{
|
{
|
||||||
xfs_mount_t *mp = ip->i_mount;
|
xfs_mount_t *mp = ip->i_mount;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003,2004 Silicon Graphics, Inc. All Rights Reserved.
|
* Copyright (c) 2003-2005 Silicon Graphics, Inc. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
* This program is free software; you can redistribute it and/or modify it
|
||||||
* under the terms of version 2 of the GNU General Public License as
|
* under the terms of version 2 of the GNU General Public License as
|
||||||
|
@ -64,13 +64,13 @@ typedef enum {
|
||||||
/*
|
/*
|
||||||
* xfs_iomap_t: File system I/O map
|
* xfs_iomap_t: File system I/O map
|
||||||
*
|
*
|
||||||
* The iomap_bn field is expressed in 512-byte blocks, and is where the
|
* The iomap_bn field is expressed in 512-byte blocks, and is where the
|
||||||
* mapping starts on disk.
|
* mapping starts on disk.
|
||||||
*
|
*
|
||||||
* The iomap_offset, iomap_bsize and iomap_delta fields are in bytes.
|
* The iomap_offset, iomap_bsize and iomap_delta fields are in bytes.
|
||||||
* iomap_offset is the offset of the mapping in the file itself.
|
* iomap_offset is the offset of the mapping in the file itself.
|
||||||
* iomap_bsize is the size of the mapping, iomap_delta is the
|
* iomap_bsize is the size of the mapping, iomap_delta is the
|
||||||
* desired data's offset into the mapping, given the offset supplied
|
* desired data's offset into the mapping, given the offset supplied
|
||||||
* to the file I/O map routine.
|
* to the file I/O map routine.
|
||||||
*
|
*
|
||||||
* When a request is made to read beyond the logical end of the object,
|
* When a request is made to read beyond the logical end of the object,
|
||||||
|
@ -81,8 +81,8 @@ typedef enum {
|
||||||
typedef struct xfs_iomap {
|
typedef struct xfs_iomap {
|
||||||
xfs_daddr_t iomap_bn; /* first 512b blk of mapping */
|
xfs_daddr_t iomap_bn; /* first 512b blk of mapping */
|
||||||
xfs_buftarg_t *iomap_target;
|
xfs_buftarg_t *iomap_target;
|
||||||
loff_t iomap_offset; /* offset of mapping, bytes */
|
xfs_off_t iomap_offset; /* offset of mapping, bytes */
|
||||||
loff_t iomap_bsize; /* size of mapping, bytes */
|
xfs_off_t iomap_bsize; /* size of mapping, bytes */
|
||||||
size_t iomap_delta; /* offset into mapping, bytes */
|
size_t iomap_delta; /* offset into mapping, bytes */
|
||||||
iomap_flags_t iomap_flags;
|
iomap_flags_t iomap_flags;
|
||||||
} xfs_iomap_t;
|
} xfs_iomap_t;
|
||||||
|
@ -93,12 +93,12 @@ struct xfs_bmbt_irec;
|
||||||
|
|
||||||
extern int xfs_iomap(struct xfs_iocore *, xfs_off_t, ssize_t, int,
|
extern int xfs_iomap(struct xfs_iocore *, xfs_off_t, ssize_t, int,
|
||||||
struct xfs_iomap *, int *);
|
struct xfs_iomap *, int *);
|
||||||
extern int xfs_iomap_write_direct(struct xfs_inode *, loff_t, size_t,
|
extern int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
|
||||||
int, struct xfs_bmbt_irec *, int *, int);
|
int, struct xfs_bmbt_irec *, int *, int);
|
||||||
extern int xfs_iomap_write_delay(struct xfs_inode *, loff_t, size_t, int,
|
extern int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
|
||||||
struct xfs_bmbt_irec *, int *);
|
struct xfs_bmbt_irec *, int *);
|
||||||
extern int xfs_iomap_write_allocate(struct xfs_inode *, loff_t, size_t,
|
extern int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
|
||||||
struct xfs_bmbt_irec *, int *);
|
struct xfs_bmbt_irec *, int *);
|
||||||
extern int xfs_iomap_write_unwritten(struct xfs_inode *, loff_t, size_t);
|
extern int xfs_iomap_write_unwritten(struct xfs_inode *, xfs_off_t, size_t);
|
||||||
|
|
||||||
#endif /* __XFS_IOMAP_H__*/
|
#endif /* __XFS_IOMAP_H__*/
|
||||||
|
|
|
@ -210,16 +210,16 @@ typedef int (*xfs_bmapi_t)(struct xfs_trans *, void *,
|
||||||
struct xfs_bmap_free *);
|
struct xfs_bmap_free *);
|
||||||
typedef int (*xfs_bmap_eof_t)(void *, xfs_fileoff_t, int, int *);
|
typedef int (*xfs_bmap_eof_t)(void *, xfs_fileoff_t, int, int *);
|
||||||
typedef int (*xfs_iomap_write_direct_t)(
|
typedef int (*xfs_iomap_write_direct_t)(
|
||||||
void *, loff_t, size_t, int,
|
void *, xfs_off_t, size_t, int,
|
||||||
struct xfs_bmbt_irec *, int *, int);
|
struct xfs_bmbt_irec *, int *, int);
|
||||||
typedef int (*xfs_iomap_write_delay_t)(
|
typedef int (*xfs_iomap_write_delay_t)(
|
||||||
void *, loff_t, size_t, int,
|
void *, xfs_off_t, size_t, int,
|
||||||
struct xfs_bmbt_irec *, int *);
|
struct xfs_bmbt_irec *, int *);
|
||||||
typedef int (*xfs_iomap_write_allocate_t)(
|
typedef int (*xfs_iomap_write_allocate_t)(
|
||||||
void *, loff_t, size_t,
|
void *, xfs_off_t, size_t,
|
||||||
struct xfs_bmbt_irec *, int *);
|
struct xfs_bmbt_irec *, int *);
|
||||||
typedef int (*xfs_iomap_write_unwritten_t)(
|
typedef int (*xfs_iomap_write_unwritten_t)(
|
||||||
void *, loff_t, size_t);
|
void *, xfs_off_t, size_t);
|
||||||
typedef uint (*xfs_lck_map_shared_t)(void *);
|
typedef uint (*xfs_lck_map_shared_t)(void *);
|
||||||
typedef void (*xfs_lock_t)(void *, uint);
|
typedef void (*xfs_lock_t)(void *, uint);
|
||||||
typedef void (*xfs_lock_demote_t)(void *, uint);
|
typedef void (*xfs_lock_demote_t)(void *, uint);
|
||||||
|
|
Loading…
Reference in a new issue