diff options
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index fc2055e64279..a6d35aee93b2 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c | |||
@@ -1711,7 +1711,7 @@ xfs_itruncate_finish( | |||
1711 | * runs. | 1711 | * runs. |
1712 | */ | 1712 | */ |
1713 | XFS_BMAP_INIT(&free_list, &first_block); | 1713 | XFS_BMAP_INIT(&free_list, &first_block); |
1714 | error = XFS_BUNMAPI(mp, ntp, &ip->i_iocore, | 1714 | error = xfs_bunmapi(ntp, ip, |
1715 | first_unmap_block, unmap_len, | 1715 | first_unmap_block, unmap_len, |
1716 | XFS_BMAPI_AFLAG(fork) | | 1716 | XFS_BMAPI_AFLAG(fork) | |
1717 | (sync ? 0 : XFS_BMAPI_ASYNC), | 1717 | (sync ? 0 : XFS_BMAPI_ASYNC), |
@@ -1844,8 +1844,6 @@ xfs_igrow_start( | |||
1844 | xfs_fsize_t new_size, | 1844 | xfs_fsize_t new_size, |
1845 | cred_t *credp) | 1845 | cred_t *credp) |
1846 | { | 1846 | { |
1847 | int error; | ||
1848 | |||
1849 | ASSERT(ismrlocked(&(ip->i_lock), MR_UPDATE) != 0); | 1847 | ASSERT(ismrlocked(&(ip->i_lock), MR_UPDATE) != 0); |
1850 | ASSERT(ismrlocked(&(ip->i_iolock), MR_UPDATE) != 0); | 1848 | ASSERT(ismrlocked(&(ip->i_iolock), MR_UPDATE) != 0); |
1851 | ASSERT(new_size > ip->i_size); | 1849 | ASSERT(new_size > ip->i_size); |
@@ -1855,9 +1853,7 @@ xfs_igrow_start( | |||
1855 | * xfs_write_file() beyond the end of the file | 1853 | * xfs_write_file() beyond the end of the file |
1856 | * and any blocks between the old and new file sizes. | 1854 | * and any blocks between the old and new file sizes. |
1857 | */ | 1855 | */ |
1858 | error = xfs_zero_eof(XFS_ITOV(ip), &ip->i_iocore, new_size, | 1856 | return xfs_zero_eof(ip, new_size, ip->i_size); |
1859 | ip->i_size); | ||
1860 | return error; | ||
1861 | } | 1857 | } |
1862 | 1858 | ||
1863 | /* | 1859 | /* |