UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xfs: Skip flip flags for delayed attrs 

This is a clean up patch that skips the flip flag logic for delayed attr
renames.  Since the log replay keeps the inode locked, we do not need to
worry about race windows with attr lookups.  So we can skip over
flipping the flag and the extra transaction roll for it

Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Allison Henderson 2022-05-09 19:09:10 +10:00 committed by Dave Chinner
parent 1d08e11d04
commit f38dc503d3
2 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,6 +358,7 @@ xfs_attr_set_iter(
struct xfs_inode *dp = args->dp; struct xfs_inode *dp = args->dp;
struct xfs_buf *bp = NULL; struct xfs_buf *bp = NULL;
int forkoff, error = 0; int forkoff, error = 0;
struct xfs_mount *mp = args->dp->i_mount;
/* State machine switch */ /* State machine switch */
switch (dac->dela_state) { switch (dac->dela_state) {
@ -480,16 +481,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the * In a separate transaction, set the incomplete flag on the
* "old" attr and clear the incomplete flag on the "new" attr. * "old" attr and clear the incomplete flag on the "new" attr.
*/ */
error = xfs_attr3_leaf_flipflags(args); if (!xfs_has_larp(mp)) {
if (error) error = xfs_attr3_leaf_flipflags(args);
return error; if (error)
/* return error;
* Commit the flag value change and start the next trans in /*
* series. * Commit the flag value change and start the next trans
*/ * in series.
dac->dela_state = XFS_DAS_FLIP_LFLAG; */
trace_xfs_attr_set_iter_return(dac->dela_state, args->dp); dac->dela_state = XFS_DAS_FLIP_LFLAG;
return -EAGAIN; trace_xfs_attr_set_iter_return(dac->dela_state,
args->dp);
return -EAGAIN;
}
fallthrough;
case XFS_DAS_FLIP_LFLAG: case XFS_DAS_FLIP_LFLAG:
/* /*
* Dismantle the "old" attribute/value pair by removing a * Dismantle the "old" attribute/value pair by removing a
@ -592,17 +598,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the * In a separate transaction, set the incomplete flag on the
* "old" attr and clear the incomplete flag on the "new" attr. * "old" attr and clear the incomplete flag on the "new" attr.
*/ */
error = xfs_attr3_leaf_flipflags(args); if (!xfs_has_larp(mp)) {
if (error) error = xfs_attr3_leaf_flipflags(args);
goto out; if (error)
/* goto out;
* Commit the flag value change and start the next trans in /*
* series * Commit the flag value change and start the next trans
*/ * in series
dac->dela_state = XFS_DAS_FLIP_NFLAG; */
trace_xfs_attr_set_iter_return(dac->dela_state, args->dp); dac->dela_state = XFS_DAS_FLIP_NFLAG;
return -EAGAIN; trace_xfs_attr_set_iter_return(dac->dela_state,
args->dp);
return -EAGAIN;
}
fallthrough;
case XFS_DAS_FLIP_NFLAG: case XFS_DAS_FLIP_NFLAG:
/* /*
* Dismantle the "old" attribute/value pair by removing a * Dismantle the "old" attribute/value pair by removing a
@ -1273,6 +1283,7 @@ xfs_attr_node_addname_clear_incomplete(
{ {
struct xfs_da_args *args = dac->da_args; struct xfs_da_args *args = dac->da_args;
struct xfs_da_state *state = NULL; struct xfs_da_state *state = NULL;
struct xfs_mount *mp = args->dp->i_mount;
int retval = 0; int retval = 0;
int error = 0; int error = 0;
@ -1280,7 +1291,8 @@ xfs_attr_node_addname_clear_incomplete(
* Re-find the "old" attribute entry after any split ops. The INCOMPLETE * Re-find the "old" attribute entry after any split ops. The INCOMPLETE
* flag means that we will find the "old" attr, not the "new" one. * flag means that we will find the "old" attr, not the "new" one.
*/ */
args->attr_filter |= XFS_ATTR_INCOMPLETE; if (!xfs_has_larp(mp))
args->attr_filter |= XFS_ATTR_INCOMPLETE;
state = xfs_da_state_alloc(args); state = xfs_da_state_alloc(args);
state->inleaf = 0; state->inleaf = 0;
error = xfs_da3_node_lookup_int(state, &retval); error = xfs_da3_node_lookup_int(state, &retval);

3
fs/xfs/libxfs/xfs_attr_leaf.c
View File

@ -1487,7 +1487,8 @@ xfs_attr3_leaf_add_work(
if (tmp) if (tmp)
entry->flags |= XFS_ATTR_LOCAL; entry->flags |= XFS_ATTR_LOCAL;
if (args->op_flags & XFS_DA_OP_RENAME) { if (args->op_flags & XFS_DA_OP_RENAME) {
entry->flags |= XFS_ATTR_INCOMPLETE; if (!xfs_has_larp(mp))
entry->flags |= XFS_ATTR_INCOMPLETE;
if ((args->blkno2 == args->blkno) && if ((args->blkno2 == args->blkno) &&
(args->index2 <= args->index)) { (args->index2 <= args->index)) {
args->index2++; args->index2++;