Commit b4ed4626 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder

xfs: mark xfs_iomap_write_ helpers static

And also drop a useless argument to xfs_iomap_write_direct.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent bd1556a1
...@@ -55,6 +55,13 @@ ...@@ -55,6 +55,13 @@
#define XFS_STRAT_WRITE_IMAPS 2 #define XFS_STRAT_WRITE_IMAPS 2
#define XFS_WRITE_IMAPS XFS_BMAP_MAX_NMAP #define XFS_WRITE_IMAPS XFS_BMAP_MAX_NMAP
STATIC int xfs_iomap_write_direct(struct xfs_inode *, xfs_off_t, size_t,
int, struct xfs_bmbt_irec *, int *);
STATIC int xfs_iomap_write_delay(struct xfs_inode *, xfs_off_t, size_t, int,
struct xfs_bmbt_irec *, int *);
STATIC int xfs_iomap_write_allocate(struct xfs_inode *, xfs_off_t, size_t,
struct xfs_bmbt_irec *, int *);
int int
xfs_iomap( xfs_iomap(
struct xfs_inode *ip, struct xfs_inode *ip,
...@@ -133,7 +140,7 @@ xfs_iomap( ...@@ -133,7 +140,7 @@ xfs_iomap(
if (flags & (BMAPI_DIRECT|BMAPI_MMAP)) { if (flags & (BMAPI_DIRECT|BMAPI_MMAP)) {
error = xfs_iomap_write_direct(ip, offset, count, flags, error = xfs_iomap_write_direct(ip, offset, count, flags,
imap, nimaps, *nimaps); imap, nimaps);
} else { } else {
error = xfs_iomap_write_delay(ip, offset, count, flags, error = xfs_iomap_write_delay(ip, offset, count, flags,
imap, nimaps); imap, nimaps);
...@@ -234,15 +241,14 @@ xfs_cmn_err_fsblock_zero( ...@@ -234,15 +241,14 @@ xfs_cmn_err_fsblock_zero(
return EFSCORRUPTED; return EFSCORRUPTED;
} }
int STATIC int
xfs_iomap_write_direct( xfs_iomap_write_direct(
xfs_inode_t *ip, xfs_inode_t *ip,
xfs_off_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,
int *nmaps, int *nmaps)
int found)
{ {
xfs_mount_t *mp = ip->i_mount; xfs_mount_t *mp = ip->i_mount;
xfs_fileoff_t offset_fsb; xfs_fileoff_t offset_fsb;
...@@ -279,7 +285,7 @@ xfs_iomap_write_direct( ...@@ -279,7 +285,7 @@ xfs_iomap_write_direct(
if (error) if (error)
goto error_out; goto error_out;
} else { } else {
if (found && (ret_imap->br_startblock == HOLESTARTBLOCK)) if (*nmaps && (ret_imap->br_startblock == HOLESTARTBLOCK))
last_fsb = MIN(last_fsb, (xfs_fileoff_t) last_fsb = MIN(last_fsb, (xfs_fileoff_t)
ret_imap->br_blockcount + ret_imap->br_blockcount +
ret_imap->br_startoff); ret_imap->br_startoff);
...@@ -434,7 +440,7 @@ xfs_iomap_eof_want_preallocate( ...@@ -434,7 +440,7 @@ xfs_iomap_eof_want_preallocate(
return 0; return 0;
} }
int STATIC int
xfs_iomap_write_delay( xfs_iomap_write_delay(
xfs_inode_t *ip, xfs_inode_t *ip,
xfs_off_t offset, xfs_off_t offset,
...@@ -537,7 +543,7 @@ xfs_iomap_write_delay( ...@@ -537,7 +543,7 @@ xfs_iomap_write_delay(
* We no longer bother to look at the incoming map - all we have to * We no longer bother to look at the incoming map - all we have to
* guarantee is that whatever we allocate fills the required range. * guarantee is that whatever we allocate fills the required range.
*/ */
int STATIC int
xfs_iomap_write_allocate( xfs_iomap_write_allocate(
xfs_inode_t *ip, xfs_inode_t *ip,
xfs_off_t offset, xfs_off_t offset,
......
...@@ -44,12 +44,6 @@ struct xfs_bmbt_irec; ...@@ -44,12 +44,6 @@ struct xfs_bmbt_irec;
extern int xfs_iomap(struct xfs_inode *, xfs_off_t, ssize_t, int, extern int xfs_iomap(struct xfs_inode *, xfs_off_t, ssize_t, int,
struct xfs_bmbt_irec *, int *, int *); struct xfs_bmbt_irec *, int *, int *);
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 *, xfs_off_t, size_t, int,
struct xfs_bmbt_irec *, int *);
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 *, xfs_off_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__*/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment