mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 10:29:37 +00:00
Code Issues Releases Wiki Activity

xfs: remove isize check from unshare operation

Browse source 
Now that fallocate has an explicit unshare flag again, let's try
to remove the inode reflink flag whenever the user unshares any
part of a file since checking is cheap compared to the CoW.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reported-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong 2016-10-10 16:49:01 +11:00 committed by Dave Chinner
parent 024adf4870
commit 97a1b87ea7
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs/xfs/xfs_reflink.c
View file

@ -1570,8 +1570,7 @@ xfs_reflink_clear_inode_flag(
*/
STATIC int
xfs_reflink_try_clear_inode_flag(
struct xfs_inode *ip,
xfs_off_t old_isize)
struct xfs_inode *ip)
{
struct xfs_mount *mp = ip->i_mount;
struct xfs_trans *tp;
@ -1585,9 +1584,6 @@ xfs_reflink_try_clear_inode_flag(
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, 0);
if (old_isize != i_size_read(VFS_I(ip)))
goto cancel;
error = xfs_reflink_clear_inode_flag(ip, &tp);
if (error)
goto cancel;
@ -1630,7 +1626,7 @@ xfs_reflink_unshare(
/* Try to CoW the selected ranges */
xfs_ilock(ip, XFS_ILOCK_EXCL);
fbno = XFS_B_TO_FSB(mp, offset);
fbno = XFS_B_TO_FSBT(mp, offset);
isize = i_size_read(VFS_I(ip));
end = XFS_B_TO_FSB(mp, offset + len);
error = xfs_reflink_dirty_extents(ip, fbno, end, isize);
@ -1643,12 +1639,10 @@ xfs_reflink_unshare(
if (error)
goto out;
/* Turn off the reflink flag if we unshared the whole file */
if (offset == 0 && len == isize) {
error = xfs_reflink_try_clear_inode_flag(ip, isize);
if (error)
goto out;
}
/* Turn off the reflink flag if possible. */
error = xfs_reflink_try_clear_inode_flag(ip);
if (error)
goto out;
return 0;