xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: use ->t_firstblock for all xfs_bunmapi() callers

Browse Source 
Convert all xfs_bunmapi() callers to ->t_firstblock.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-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:
Brian Foster
2018-07-11 22:26:23 -07:00
committed by Darrick J. Wong
parent 650919f131
commit 372837978d
5 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fs/xfs/xfs_reflink.c
View File

@@ -627,7 +627,6 @@ xfs_reflink_end_cow(
struct xfs_trans *tp;
xfs_fileoff_t offset_fsb;
xfs_fileoff_t end_fsb;
xfs_fsblock_t firstfsb;
struct xfs_defer_ops dfops;
int error;
unsigned int resblks;
@@ -695,10 +694,10 @@ xfs_reflink_end_cow(
goto prev_extent;
/* Unmap the old blocks in the data fork. */
xfs_defer_init(tp, &dfops, &firstfsb);
xfs_defer_init(tp, &dfops, &tp->t_firstblock);
rlen = del.br_blockcount;
error = __xfs_bunmapi(tp, ip, del.br_startoff, &rlen, 0, 1,
&firstfsb);
&tp->t_firstblock);
if (error)
goto out_defer;
@@ -1002,7 +1001,6 @@ xfs_reflink_remap_extent(
struct xfs_mount *mp = ip->i_mount;
bool real_extent = xfs_bmap_is_real_extent(irec);
struct xfs_trans *tp;
xfs_fsblock_t firstfsb;
unsigned int resblks;
struct xfs_defer_ops dfops;
struct xfs_bmbt_irec uirec;
@@ -1045,8 +1043,9 @@ xfs_reflink_remap_extent(
/* Unmap the old blocks in the data fork. */
rlen = unmap_len;
while (rlen) {
xfs_defer_init(tp, &dfops, &firstfsb);
error = __xfs_bunmapi(tp, ip, destoff, &rlen, 0, 1, &firstfsb);
xfs_defer_init(tp, &dfops, &tp->t_firstblock);
error = __xfs_bunmapi(tp, ip, destoff, &rlen, 0, 1,
&tp->t_firstblock);
if (error)
goto out_defer;