Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f403b7f4 authored by Nathan Scott's avatar Nathan Scott Committed by Christoph Hellwig
Browse files

[XFS] Cleanup use of loff_t vs xfs_off_t in the core code. 



SGI Modid: xfs-linux:xfs-kern:22378a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@sgi.com>
parent 24e17b5f

fs/xfs/xfs_dfrag.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ xfs_swapext( 


	if (VN_CACHED(tvp) != 0)

		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 */

	if (VN_CACHED(tvp) != 0) {

fs/xfs/xfs_iomap.c

+4 −4
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ xfs_flush_space( 
int

xfs_iomap_write_direct(

	xfs_inode_t	*ip,

	loff_t		offset,

	xfs_off_t	offset,

	size_t		count,

	int		flags,

	xfs_bmbt_irec_t *ret_imap,
@@ -542,7 +542,7 @@ xfs_iomap_write_direct( 
int

xfs_iomap_write_delay(

	xfs_inode_t	*ip,

	loff_t		offset,

	xfs_off_t	offset,

	size_t		count,

	int		ioflag,

	xfs_bmbt_irec_t *ret_imap,
@@ -747,7 +747,7 @@ xfs_iomap_write_delay( 
int

xfs_iomap_write_allocate(

	xfs_inode_t	*ip,

	loff_t		offset,

	xfs_off_t	offset,

	size_t		count,

	xfs_bmbt_irec_t *map,

	int		*retmap)
@@ -901,7 +901,7 @@ xfs_iomap_write_allocate( 
int

xfs_iomap_write_unwritten(

	xfs_inode_t	*ip,

	loff_t		offset,

	xfs_off_t	offset,

	size_t		count)

{

	xfs_mount_t	*mp = ip->i_mount;

fs/xfs/xfs_iomap.h

+10 −10
Original line number Diff line number Diff line 
/*

 * 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

 * under the terms of version 2 of the GNU General Public License as
@@ -81,8 +81,8 @@ typedef enum { 
typedef struct xfs_iomap {

	xfs_daddr_t		iomap_bn;	/* first 512b blk of mapping */

	xfs_buftarg_t		*iomap_target;

	loff_t			iomap_offset;	/* offset of mapping, bytes */

	loff_t			iomap_bsize;	/* size of mapping, bytes */

	xfs_off_t		iomap_offset;	/* offset of mapping, bytes */

	xfs_off_t		iomap_bsize;	/* size of mapping, bytes */

	size_t			iomap_delta;	/* offset into mapping, bytes */

	iomap_flags_t		iomap_flags;

} xfs_iomap_t;
@@ -93,12 +93,12 @@ struct xfs_bmbt_irec; 


extern int xfs_iomap(struct xfs_iocore *, xfs_off_t, ssize_t, 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);

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 *);

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 *);

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__*/

fs/xfs/xfs_mount.h

+4 −4
Original line number Diff line number Diff line
@@ -210,16 +210,16 @@ typedef int (*xfs_bmapi_t)(struct xfs_trans *, void *, 
				struct xfs_bmap_free *);

typedef int		(*xfs_bmap_eof_t)(void *, xfs_fileoff_t, int, int *);

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);

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 *);

typedef int		(*xfs_iomap_write_allocate_t)(

				void *, loff_t, size_t,

				void *, xfs_off_t, size_t,

				struct xfs_bmbt_irec *, int *);

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 void		(*xfs_lock_t)(void *, uint);

typedef void		(*xfs_lock_demote_t)(void *, uint);