GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

58
fs/xfs/libxfs/xfs_attr.c
View file

@ -204,7 +204,7 @@ xfs_attr_set(
{
struct xfs_mount *mp = dp->i_mount;
struct xfs_da_args args;
struct xfs_bmap_free flist;
struct xfs_defer_ops flist;
struct xfs_trans_res tres;
xfs_fsblock_t firstblock;
int rsvd = (flags & ATTR_ROOT) != 0;
@ -317,13 +317,13 @@ xfs_attr_set(
* It won't fit in the shortform, transform to a leaf block.
* GROT: another possible req'mt for a double-split btree op.
*/
xfs_bmap_init(args.flist, args.firstblock);
xfs_defer_init(args.flist, args.firstblock);
error = xfs_attr_shortform_to_leaf(&args);
if (!error)
error = xfs_bmap_finish(&args.trans, args.flist, dp);
error = xfs_defer_finish(&args.trans, args.flist, dp);
if (error) {
args.trans = NULL;
xfs_bmap_cancel(&flist);
xfs_defer_cancel(&flist);
goto out;
}
@ -383,7 +383,7 @@ xfs_attr_remove(
{
struct xfs_mount *mp = dp->i_mount;
struct xfs_da_args args;
struct xfs_bmap_free flist;
struct xfs_defer_ops flist;
xfs_fsblock_t firstblock;
int error;
@ -585,13 +585,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
* Commit that transaction so that the node_addname() call
* can manage its own transactions.
*/
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_attr3_leaf_to_node(args);
if (!error)
error = xfs_bmap_finish(&args->trans, args->flist, dp);
error = xfs_defer_finish(&args->trans, args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
return error;
}
@ -675,15 +675,15 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
* If the result is small enough, shrink it all into the inode.
*/
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (!error)
error = xfs_bmap_finish(&args->trans,
error = xfs_defer_finish(&args->trans,
args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
return error;
}
}
@ -738,14 +738,14 @@ xfs_attr_leaf_removename(xfs_da_args_t *args)
* If the result is small enough, shrink it all into the inode.
*/
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (!error)
error = xfs_bmap_finish(&args->trans, args->flist, dp);
error = xfs_defer_finish(&args->trans, args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
return error;
}
}
@ -864,14 +864,14 @@ restart:
*/
xfs_da_state_free(state);
state = NULL;
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_attr3_leaf_to_node(args);
if (!error)
error = xfs_bmap_finish(&args->trans,
error = xfs_defer_finish(&args->trans,
args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
goto out;
}
@ -892,13 +892,13 @@ restart:
* in the index/blkno/rmtblkno/rmtblkcnt fields and
* in the index2/blkno2/rmtblkno2/rmtblkcnt2 fields.
*/
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_da3_split(state);
if (!error)
error = xfs_bmap_finish(&args->trans, args->flist, dp);
error = xfs_defer_finish(&args->trans, args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
goto out;
}
} else {
@ -991,14 +991,14 @@ restart:
* Check to see if the tree needs to be collapsed.
*/
if (retval && (state->path.active > 1)) {
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_da3_join(state);
if (!error)
error = xfs_bmap_finish(&args->trans,
error = xfs_defer_finish(&args->trans,
args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
goto out;
}
}
@ -1114,13 +1114,13 @@ xfs_attr_node_removename(xfs_da_args_t *args)
* Check to see if the tree needs to be collapsed.
*/
if (retval && (state->path.active > 1)) {
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_da3_join(state);
if (!error)
error = xfs_bmap_finish(&args->trans, args->flist, dp);
error = xfs_defer_finish(&args->trans, args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
goto out;
}
/*
@ -1147,15 +1147,15 @@ xfs_attr_node_removename(xfs_da_args_t *args)
goto out;
if ((forkoff = xfs_attr_shortform_allfit(bp, dp))) {
xfs_bmap_init(args->flist, args->firstblock);
xfs_defer_init(args->flist, args->firstblock);
error = xfs_attr3_leaf_to_shortform(bp, args, forkoff);
/* bp is gone due to xfs_da_shrink_inode */
if (!error)
error = xfs_bmap_finish(&args->trans,
error = xfs_defer_finish(&args->trans,
args->flist, dp);
if (error) {
args->trans = NULL;
xfs_bmap_cancel(args->flist);
xfs_defer_cancel(args->flist);
goto out;
}
} else