Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 06:31:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: use ->t_firstblock in insert/collapse range

Browse Source 
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:24 -07:00 committed by Darrick J. Wong
parent 580c4ff948
commit d0a9d79572
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/xfs/xfs_bmap_util.c
View File

@ -1311,7 +1311,6 @@ xfs_collapse_file_space(
struct xfs_trans *tp; struct xfs_trans *tp;
int error; int error;
struct xfs_defer_ops dfops; struct xfs_defer_ops dfops;
xfs_fsblock_t first_block;
xfs_fileoff_t next_fsb = XFS_B_TO_FSB(mp, offset + len); xfs_fileoff_t next_fsb = XFS_B_TO_FSB(mp, offset + len);
xfs_fileoff_t shift_fsb = XFS_B_TO_FSB(mp, len); xfs_fileoff_t shift_fsb = XFS_B_TO_FSB(mp, len);
uint resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0); uint resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0);
@ -1344,9 +1343,9 @@ xfs_collapse_file_space(
goto out_trans_cancel; goto out_trans_cancel;
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_defer_init(tp, &dfops, &first_block); xfs_defer_init(tp, &dfops, &tp->t_firstblock);
error = xfs_bmap_collapse_extents(tp, ip, &next_fsb, shift_fsb, error = xfs_bmap_collapse_extents(tp, ip, &next_fsb, shift_fsb,
&done, &first_block); &done, &tp->t_firstblock);
if (error) if (error)
goto out_bmap_cancel; goto out_bmap_cancel;
@ -1387,7 +1386,6 @@ xfs_insert_file_space(
struct xfs_trans *tp; struct xfs_trans *tp;
int error; int error;
struct xfs_defer_ops dfops; struct xfs_defer_ops dfops;
xfs_fsblock_t first_block;
xfs_fileoff_t stop_fsb = XFS_B_TO_FSB(mp, offset); xfs_fileoff_t stop_fsb = XFS_B_TO_FSB(mp, offset);
xfs_fileoff_t next_fsb = NULLFSBLOCK; xfs_fileoff_t next_fsb = NULLFSBLOCK;
xfs_fileoff_t shift_fsb = XFS_B_TO_FSB(mp, len); xfs_fileoff_t shift_fsb = XFS_B_TO_FSB(mp, len);
@ -1423,9 +1421,9 @@ xfs_insert_file_space(
xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
xfs_defer_init(tp, &dfops, &first_block); xfs_defer_init(tp, &dfops, &tp->t_firstblock);
error = xfs_bmap_insert_extents(tp, ip, &next_fsb, shift_fsb, error = xfs_bmap_insert_extents(tp, ip, &next_fsb, shift_fsb,
&done, stop_fsb, &first_block); &done, stop_fsb, &tp->t_firstblock);
if (error) if (error)
goto out_bmap_cancel; goto out_bmap_cancel;