diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-09-29 13:47:46 +1000 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2018-09-29 13:47:46 +1000 |
| commit | 0065b54119973c9089f8222c1c8f9237ed9787a9 (patch) | |
| tree | b6c53077d1fe10356b92085c9ed912964fb19cd1 /fs/xfs | |
| parent | df307077916fde42734a49022fc8ed23cc58caa4 (diff) | |
| download | linux-0065b54119973c9089f8222c1c8f9237ed9787a9.tar.gz linux-0065b54119973c9089f8222c1c8f9237ed9787a9.tar.bz2 linux-0065b54119973c9089f8222c1c8f9237ed9787a9.zip | |
xfs: don't bring in extents in xfs_bmap_punch_delalloc_range
This function is only used to punch out delayed allocations on I/O
failure, which means we need to have read the extents earlier.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_bmap_util.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index ae3cc393724f..6de8d90041ff 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c @@ -702,13 +702,9 @@ xfs_bmap_punch_delalloc_range( struct xfs_iext_cursor icur; int error = 0; - xfs_ilock(ip, XFS_ILOCK_EXCL); - if (!(ifp->if_flags & XFS_IFEXTENTS)) { - error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK); - if (error) - goto out_unlock; - } + ASSERT(ifp->if_flags & XFS_IFEXTENTS); + xfs_ilock(ip, XFS_ILOCK_EXCL); if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got)) goto out_unlock; |