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

xfs: remove xfs_defer_init() firstblock param

Browse Source 
All but one caller of xfs_defer_init() passes in the ->t_firstblock
of the associated transaction. The one outlier is
xlog_recover_process_intents(), which simply passes a dummy value
because a valid pointer is required. This firstblock variable can
simply be removed.

At this point we could remove the xfs_defer_init() firstblock
parameter and initialize ->t_firstblock directly. Even that is not
necessary, however, because ->t_firstblock is automatically
reinitialized in the new transaction on a transaction roll. Since
xfs_defer_init() should never occur more than once on a particular
transaction (since the corresponding finish will roll it), replace
the reinit from xfs_defer_init() with an assert that verifies the
transaction has a NULLFSBLOCK 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:33 -07:00
committed by Darrick J. Wong
parent 9c3bf5da80
commit 5fdd97944e
14 changed files with 44 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fs/xfs/libxfs/xfs_attr.c
View File

@@ -251,7 +251,7 @@ xfs_attr_set(
rsvd ? XFS_TRANS_RESERVE : 0, &args.trans);
if (error)
return error;
xfs_defer_init(args.trans, &dfops, &args.trans->t_firstblock);
xfs_defer_init(args.trans, &dfops);
xfs_ilock(dp, XFS_ILOCK_EXCL);
error = xfs_trans_reserve_quota_nblks(args.trans, dp, args.total, 0,
@@ -422,7 +422,7 @@ xfs_attr_remove(
&args.trans);
if (error)
return error;
xfs_defer_init(args.trans, &dfops, &args.trans->t_firstblock);
xfs_defer_init(args.trans, &dfops);
xfs_ilock(dp, XFS_ILOCK_EXCL);
/*
@@ -593,8 +593,7 @@ xfs_attr_leaf_addname(
* Commit that transaction so that the node_addname() call
* can manage its own transactions.
*/
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_attr3_leaf_to_node(args);
if (error)
goto out_defer_cancel;
@@ -683,8 +682,7 @@ xfs_attr_leaf_addname(
* If the result is small enough, shrink it all into the inode.
*/
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (error)
@@ -749,8 +747,7 @@ xfs_attr_leaf_removename(
* If the result is small enough, shrink it all into the inode.
*/
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (error)
@@ -879,8 +876,7 @@ restart:
*/
xfs_da_state_free(state);
state = NULL;
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_attr3_leaf_to_node(args);
if (error)
goto out_defer_cancel;
@@ -907,8 +903,7 @@ restart:
* in the index/blkno/rmtblkno/rmtblkcnt fields and
* in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.
*/
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_da3_split(state);
if (error)
goto out_defer_cancel;
@@ -1006,8 +1001,7 @@ restart:
* Check to see if the tree needs to be collapsed.
*/
if (retval && (state->path.active > 1)) {
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_da3_join(state);
if (error)
goto out_defer_cancel;
@@ -1132,8 +1126,7 @@ xfs_attr_node_removename(
* Check to see if the tree needs to be collapsed.
*/
if (retval && (state->path.active > 1)) {
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_da3_join(state);
if (error)
goto out_defer_cancel;
@@ -1165,8 +1158,7 @@ xfs_attr_node_removename(
goto out;
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_defer_init(args->trans, args->trans->t_dfops,
&args->trans->t_firstblock);
xfs_defer_init(args->trans, args->trans->t_dfops);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (error)