[XFS] kill xfs_igrow_start and xfs_igrow_finish
xfs_igrow_start just expands to xfs_zero_eof with two asserts that are useless in the context of the only caller and some rather confusing comments. xfs_igrow_finish is just a few lines of code decorated again with useless asserts and confusing comments. Just kill those two and merge them into xfs_setattr. SGI-PV: 981498 SGI-Modid: xfs-linux-melb:xfs-kern:31186a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>wifi-calibration
parent
48b62a1a97
commit
61436febae
|
@ -1763,67 +1763,6 @@ xfs_itruncate_finish(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* xfs_igrow_start
|
|
||||||
*
|
|
||||||
* Do the first part of growing a file: zero any data in the last
|
|
||||||
* block that is beyond the old EOF. We need to do this before
|
|
||||||
* the inode is joined to the transaction to modify the i_size.
|
|
||||||
* That way we can drop the inode lock and call into the buffer
|
|
||||||
* cache to get the buffer mapping the EOF.
|
|
||||||
*/
|
|
||||||
int
|
|
||||||
xfs_igrow_start(
|
|
||||||
xfs_inode_t *ip,
|
|
||||||
xfs_fsize_t new_size,
|
|
||||||
cred_t *credp)
|
|
||||||
{
|
|
||||||
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL));
|
|
||||||
ASSERT(new_size > ip->i_size);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Zero any pages that may have been created by
|
|
||||||
* xfs_write_file() beyond the end of the file
|
|
||||||
* and any blocks between the old and new file sizes.
|
|
||||||
*/
|
|
||||||
return xfs_zero_eof(ip, new_size, ip->i_size);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* xfs_igrow_finish
|
|
||||||
*
|
|
||||||
* This routine is called to extend the size of a file.
|
|
||||||
* The inode must have both the iolock and the ilock locked
|
|
||||||
* for update and it must be a part of the current transaction.
|
|
||||||
* The xfs_igrow_start() function must have been called previously.
|
|
||||||
* If the change_flag is not zero, the inode change timestamp will
|
|
||||||
* be updated.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
xfs_igrow_finish(
|
|
||||||
xfs_trans_t *tp,
|
|
||||||
xfs_inode_t *ip,
|
|
||||||
xfs_fsize_t new_size,
|
|
||||||
int change_flag)
|
|
||||||
{
|
|
||||||
ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL|XFS_IOLOCK_EXCL));
|
|
||||||
ASSERT(ip->i_transp == tp);
|
|
||||||
ASSERT(new_size > ip->i_size);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Update the file size. Update the inode change timestamp
|
|
||||||
* if change_flag set.
|
|
||||||
*/
|
|
||||||
ip->i_d.di_size = new_size;
|
|
||||||
ip->i_size = new_size;
|
|
||||||
if (change_flag)
|
|
||||||
xfs_ichgtime(ip, XFS_ICHGTIME_CHG);
|
|
||||||
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is called when the inode's link count goes to 0.
|
* This is called when the inode's link count goes to 0.
|
||||||
* We place the on-disk inode on a list in the AGI. It
|
* We place the on-disk inode on a list in the AGI. It
|
||||||
|
|
|
@ -507,9 +507,6 @@ int xfs_itruncate_start(xfs_inode_t *, uint, xfs_fsize_t);
|
||||||
int xfs_itruncate_finish(struct xfs_trans **, xfs_inode_t *,
|
int xfs_itruncate_finish(struct xfs_trans **, xfs_inode_t *,
|
||||||
xfs_fsize_t, int, int);
|
xfs_fsize_t, int, int);
|
||||||
int xfs_iunlink(struct xfs_trans *, xfs_inode_t *);
|
int xfs_iunlink(struct xfs_trans *, xfs_inode_t *);
|
||||||
int xfs_igrow_start(xfs_inode_t *, xfs_fsize_t, struct cred *);
|
|
||||||
void xfs_igrow_finish(struct xfs_trans *, xfs_inode_t *,
|
|
||||||
xfs_fsize_t, int);
|
|
||||||
|
|
||||||
void xfs_idestroy_fork(xfs_inode_t *, int);
|
void xfs_idestroy_fork(xfs_inode_t *, int);
|
||||||
void xfs_idestroy(xfs_inode_t *);
|
void xfs_idestroy(xfs_inode_t *);
|
||||||
|
|
|
@ -444,7 +444,13 @@ xfs_setattr(
|
||||||
code = 0;
|
code = 0;
|
||||||
if ((vap->va_size > ip->i_size) &&
|
if ((vap->va_size > ip->i_size) &&
|
||||||
(flags & ATTR_NOSIZETOK) == 0) {
|
(flags & ATTR_NOSIZETOK) == 0) {
|
||||||
code = xfs_igrow_start(ip, vap->va_size, credp);
|
/*
|
||||||
|
* Do the first part of growing a file: zero any data
|
||||||
|
* in the last block that is beyond the old EOF. We
|
||||||
|
* need to do this before the inode is joined to the
|
||||||
|
* transaction to modify the i_size.
|
||||||
|
*/
|
||||||
|
code = xfs_zero_eof(ip, vap->va_size, ip->i_size);
|
||||||
}
|
}
|
||||||
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
xfs_iunlock(ip, XFS_ILOCK_EXCL);
|
||||||
|
|
||||||
|
@ -512,8 +518,11 @@ xfs_setattr(
|
||||||
timeflags |= XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG;
|
timeflags |= XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG;
|
||||||
|
|
||||||
if (vap->va_size > ip->i_size) {
|
if (vap->va_size > ip->i_size) {
|
||||||
xfs_igrow_finish(tp, ip, vap->va_size,
|
ip->i_d.di_size = vap->va_size;
|
||||||
!(flags & ATTR_DMI));
|
ip->i_size = vap->va_size;
|
||||||
|
if (!(flags & ATTR_DMI))
|
||||||
|
xfs_ichgtime(ip, XFS_ICHGTIME_CHG);
|
||||||
|
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
|
||||||
} else if ((vap->va_size <= ip->i_size) ||
|
} else if ((vap->va_size <= ip->i_size) ||
|
||||||
((vap->va_size == 0) && ip->i_d.di_nextents)) {
|
((vap->va_size == 0) && ip->i_d.di_nextents)) {
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue