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

xfs: change xfs_bmap_{finish,cancel,init,free} -> xfs_defer_*

Browse Source 
Drop the compatibility shims that we were using to integrate the new
deferred operation mechanism into the existing code.  No new code.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Darrick J. Wong
2016-08-03 11:18:10 +10:00
committed by Dave Chinner
parent 3ab78df2a5
commit 310a75a3c6
23 changed files with 182 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fs/xfs/xfs_iomap.c
View File

@@ -129,7 +129,7 @@ xfs_iomap_write_direct(
int quota_flag;
int rt;
xfs_trans_t *tp;
xfs_bmap_free_t free_list;
struct xfs_defer_ops free_list;
uint qblocks, resblks, resrtextents;
int error;
int lockmode;
@@ -232,7 +232,7 @@ xfs_iomap_write_direct(
* From this point onwards we overwrite the imap pointer that the
* caller gave to us.
*/
xfs_bmap_init(&free_list, &firstfsb);
xfs_defer_init(&free_list, &firstfsb);
nimaps = 1;
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
bmapi_flags, &firstfsb, resblks, imap,
@@ -243,7 +243,7 @@ xfs_iomap_write_direct(
/*
* Complete the transaction
*/
error = xfs_bmap_finish(&tp, &free_list, NULL);
error = xfs_defer_finish(&tp, &free_list, NULL);
if (error)
goto out_bmap_cancel;
@@ -267,7 +267,7 @@ out_unlock:
return error;
out_bmap_cancel:
xfs_bmap_cancel(&free_list);
xfs_defer_cancel(&free_list);
xfs_trans_unreserve_quota_nblks(tp, ip, (long)qblocks, 0, quota_flag);
out_trans_cancel:
xfs_trans_cancel(tp);
@@ -686,7 +686,7 @@ xfs_iomap_write_allocate(
xfs_fileoff_t offset_fsb, last_block;
xfs_fileoff_t end_fsb, map_start_fsb;
xfs_fsblock_t first_block;
xfs_bmap_free_t free_list;
struct xfs_defer_ops free_list;
xfs_filblks_t count_fsb;
xfs_trans_t *tp;
int nimaps;
@@ -728,7 +728,7 @@ xfs_iomap_write_allocate(
xfs_ilock(ip, XFS_ILOCK_EXCL);
xfs_trans_ijoin(tp, ip, 0);
xfs_bmap_init(&free_list, &first_block);
xfs_defer_init(&free_list, &first_block);
/*
* it is possible that the extents have changed since
@@ -788,7 +788,7 @@ xfs_iomap_write_allocate(
if (error)
goto trans_cancel;
error = xfs_bmap_finish(&tp, &free_list, NULL);
error = xfs_defer_finish(&tp, &free_list, NULL);
if (error)
goto trans_cancel;
@@ -822,7 +822,7 @@ xfs_iomap_write_allocate(
}
trans_cancel:
xfs_bmap_cancel(&free_list);
xfs_defer_cancel(&free_list);
xfs_trans_cancel(tp);
error0:
xfs_iunlock(ip, XFS_ILOCK_EXCL);
@@ -843,7 +843,7 @@ xfs_iomap_write_unwritten(
int nimaps;
xfs_trans_t *tp;
xfs_bmbt_irec_t imap;
xfs_bmap_free_t free_list;
struct xfs_defer_ops free_list;
xfs_fsize_t i_size;
uint resblks;
int error;
@@ -887,7 +887,7 @@ xfs_iomap_write_unwritten(
/*
* Modify the unwritten extent state of the buffer.
*/
xfs_bmap_init(&free_list, &firstfsb);
xfs_defer_init(&free_list, &firstfsb);
nimaps = 1;
error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
XFS_BMAPI_CONVERT, &firstfsb, resblks,
@@ -910,7 +910,7 @@ xfs_iomap_write_unwritten(
xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
}
error = xfs_bmap_finish(&tp, &free_list, NULL);
error = xfs_defer_finish(&tp, &free_list, NULL);
if (error)
goto error_on_bmapi_transaction;
@@ -937,7 +937,7 @@ xfs_iomap_write_unwritten(
return 0;
error_on_bmapi_transaction:
xfs_bmap_cancel(&free_list);
xfs_defer_cancel(&free_list);
xfs_trans_cancel(tp);
xfs_iunlock(ip, XFS_ILOCK_EXCL);
return error;