openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: Add remote block helper functions 

This patch adds two new helper functions xfs_attr_store_rmt_blk and
xfs_attr_restore_rmt_blk. These two helpers assist to remove redundant
code associated with storing and retrieving remote blocks during the
attr set operations.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
Allison Collins 2020-07-20 21:47:29 -07:00 committed by Darrick J. Wong
parent f44df68c82
commit 410c19885d
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,6 +564,30 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
* External routines when attribute list is one block * External routines when attribute list is one block
*========================================================================*/ *========================================================================*/
/* Store info about a remote block */
STATIC void
xfs_attr_save_rmt_blk(
struct xfs_da_args *args)
{
args->blkno2 = args->blkno;
args->index2 = args->index;
args->rmtblkno2 = args->rmtblkno;
args->rmtblkcnt2 = args->rmtblkcnt;
args->rmtvaluelen2 = args->rmtvaluelen;
}
/* Set stored info about a remote block */
STATIC void
xfs_attr_restore_rmt_blk(
struct xfs_da_args *args)
{
args->blkno = args->blkno2;
args->index = args->index2;
args->rmtblkno = args->rmtblkno2;
args->rmtblkcnt = args->rmtblkcnt2;
args->rmtvaluelen = args->rmtvaluelen2;
}
/* /*
* Tries to add an attribute to an inode in leaf form * Tries to add an attribute to an inode in leaf form
* *
@ -598,11 +622,7 @@ xfs_attr_leaf_try_add(
/* save the attribute state for later removal*/ /* save the attribute state for later removal*/
args->op_flags |= XFS_DA_OP_RENAME; /* an atomic rename */ args->op_flags |= XFS_DA_OP_RENAME; /* an atomic rename */
args->blkno2 = args->blkno; /* set 2nd entry info*/ xfs_attr_save_rmt_blk(args);
args->index2 = args->index;
args->rmtblkno2 = args->rmtblkno;
args->rmtblkcnt2 = args->rmtblkcnt;
args->rmtvaluelen2 = args->rmtvaluelen;
/* /*
* clear the remote attr state now that it is saved so that the * clear the remote attr state now that it is saved so that the
@ -701,11 +721,8 @@ xfs_attr_leaf_addname(
* Dismantle the "old" attribute/value pair by removing * Dismantle the "old" attribute/value pair by removing
* a "remote" value (if it exists). * a "remote" value (if it exists).
*/ */
args->index = args->index2; xfs_attr_restore_rmt_blk(args);
args->blkno = args->blkno2;
args->rmtblkno = args->rmtblkno2;
args->rmtblkcnt = args->rmtblkcnt2;
args->rmtvaluelen = args->rmtvaluelen2;
if (args->rmtblkno) { if (args->rmtblkno) {
error = xfs_attr_rmtval_invalidate(args); error = xfs_attr_rmtval_invalidate(args);
if (error) if (error)
@ -919,11 +936,7 @@ xfs_attr_node_addname(
/* save the attribute state for later removal*/ /* save the attribute state for later removal*/
args->op_flags |= XFS_DA_OP_RENAME; /* atomic rename op */ args->op_flags |= XFS_DA_OP_RENAME; /* atomic rename op */
args->blkno2 = args->blkno; /* set 2nd entry info*/ xfs_attr_save_rmt_blk(args);
args->index2 = args->index;
args->rmtblkno2 = args->rmtblkno;
args->rmtblkcnt2 = args->rmtblkcnt;
args->rmtvaluelen2 = args->rmtvaluelen;
/* /*
* clear the remote attr state now that it is saved so that the * clear the remote attr state now that it is saved so that the
@ -1035,11 +1048,8 @@ xfs_attr_node_addname(
* Dismantle the "old" attribute/value pair by removing * Dismantle the "old" attribute/value pair by removing
* a "remote" value (if it exists). * a "remote" value (if it exists).
*/ */
args->index = args->index2; xfs_attr_restore_rmt_blk(args);
args->blkno = args->blkno2;
args->rmtblkno = args->rmtblkno2;
args->rmtblkcnt = args->rmtblkcnt2;
args->rmtvaluelen = args->rmtvaluelen2;
if (args->rmtblkno) { if (args->rmtblkno) {
error = xfs_attr_rmtval_invalidate(args); error = xfs_attr_rmtval_invalidate(args);
if (error) if (error)