xfs: consolidate preallocation in xfs_file_fallocate
Remove xfs_zero_file_space and reorganize xfs_file_fallocate so that a single call to xfs_alloc_file_space covers all modes that preallocate blocks. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
parent
7a42c70ea0
commit
360c09c01c
@ -1133,43 +1133,6 @@ xfs_free_file_space(
|
|||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Preallocate and zero a range of a file. This mechanism has the allocation
|
|
||||||
* semantics of fallocate and in addition converts data in the range to zeroes.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
xfs_zero_file_space(
|
|
||||||
struct xfs_inode *ip,
|
|
||||||
xfs_off_t offset,
|
|
||||||
xfs_off_t len)
|
|
||||||
{
|
|
||||||
struct xfs_mount *mp = ip->i_mount;
|
|
||||||
uint blksize;
|
|
||||||
int error;
|
|
||||||
|
|
||||||
trace_xfs_zero_file_space(ip);
|
|
||||||
|
|
||||||
blksize = 1 << mp->m_sb.sb_blocklog;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Punch a hole and prealloc the range. We use hole punch rather than
|
|
||||||
* unwritten extent conversion for two reasons:
|
|
||||||
*
|
|
||||||
* 1.) Hole punch handles partial block zeroing for us.
|
|
||||||
*
|
|
||||||
* 2.) If prealloc returns ENOSPC, the file range is still zero-valued
|
|
||||||
* by virtue of the hole punch.
|
|
||||||
*/
|
|
||||||
error = xfs_free_file_space(ip, offset, len);
|
|
||||||
if (error || xfs_is_always_cow_inode(ip))
|
|
||||||
return error;
|
|
||||||
|
|
||||||
return xfs_alloc_file_space(ip, round_down(offset, blksize),
|
|
||||||
round_up(offset + len, blksize) -
|
|
||||||
round_down(offset, blksize),
|
|
||||||
XFS_BMAPI_PREALLOC);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
xfs_prepare_shift(
|
xfs_prepare_shift(
|
||||||
struct xfs_inode *ip,
|
struct xfs_inode *ip,
|
||||||
|
@ -59,8 +59,6 @@ int xfs_alloc_file_space(struct xfs_inode *ip, xfs_off_t offset,
|
|||||||
xfs_off_t len, int alloc_type);
|
xfs_off_t len, int alloc_type);
|
||||||
int xfs_free_file_space(struct xfs_inode *ip, xfs_off_t offset,
|
int xfs_free_file_space(struct xfs_inode *ip, xfs_off_t offset,
|
||||||
xfs_off_t len);
|
xfs_off_t len);
|
||||||
int xfs_zero_file_space(struct xfs_inode *ip, xfs_off_t offset,
|
|
||||||
xfs_off_t len);
|
|
||||||
int xfs_collapse_file_space(struct xfs_inode *, xfs_off_t offset,
|
int xfs_collapse_file_space(struct xfs_inode *, xfs_off_t offset,
|
||||||
xfs_off_t len);
|
xfs_off_t len);
|
||||||
int xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset,
|
int xfs_insert_file_space(struct xfs_inode *, xfs_off_t offset,
|
||||||
|
@ -880,16 +880,30 @@ xfs_file_fallocate(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mode & FALLOC_FL_ZERO_RANGE) {
|
if (mode & FALLOC_FL_ZERO_RANGE) {
|
||||||
error = xfs_zero_file_space(ip, offset, len);
|
/*
|
||||||
|
* Punch a hole and prealloc the range. We use a hole
|
||||||
|
* punch rather than unwritten extent conversion for two
|
||||||
|
* reasons:
|
||||||
|
*
|
||||||
|
* 1.) Hole punch handles partial block zeroing for us.
|
||||||
|
* 2.) If prealloc returns ENOSPC, the file range is
|
||||||
|
* still zero-valued by virtue of the hole punch.
|
||||||
|
*/
|
||||||
|
unsigned int blksize = i_blocksize(inode);
|
||||||
|
|
||||||
|
trace_xfs_zero_file_space(ip);
|
||||||
|
|
||||||
|
error = xfs_free_file_space(ip, offset, len);
|
||||||
|
if (error)
|
||||||
|
goto out_unlock;
|
||||||
|
|
||||||
|
len = round_up(offset + len, blksize) -
|
||||||
|
round_down(offset, blksize);
|
||||||
|
offset = round_down(offset, blksize);
|
||||||
} else if (mode & FALLOC_FL_UNSHARE_RANGE) {
|
} else if (mode & FALLOC_FL_UNSHARE_RANGE) {
|
||||||
error = xfs_reflink_unshare(ip, offset, len);
|
error = xfs_reflink_unshare(ip, offset, len);
|
||||||
if (error)
|
if (error)
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
|
|
||||||
if (!xfs_is_always_cow_inode(ip)) {
|
|
||||||
error = xfs_alloc_file_space(ip, offset, len,
|
|
||||||
XFS_BMAPI_PREALLOC);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
/*
|
/*
|
||||||
* If always_cow mode we can't use preallocations and
|
* If always_cow mode we can't use preallocations and
|
||||||
@ -899,12 +913,14 @@ xfs_file_fallocate(
|
|||||||
error = -EOPNOTSUPP;
|
error = -EOPNOTSUPP;
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!xfs_is_always_cow_inode(ip)) {
|
||||||
error = xfs_alloc_file_space(ip, offset, len,
|
error = xfs_alloc_file_space(ip, offset, len,
|
||||||
XFS_BMAPI_PREALLOC);
|
XFS_BMAPI_PREALLOC);
|
||||||
|
if (error)
|
||||||
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
if (error)
|
|
||||||
goto out_unlock;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (file->f_flags & O_DSYNC)
|
if (file->f_flags & O_DSYNC)
|
||||||
|
Loading…
Reference in New Issue
Block a user