mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname

Browse source 
Lift -ENOSPC handler from xfs_attr_leaf_addname.  This will help to
reorganize transitions between the attr forms later.

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.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:31 -07:00 committed by Darrick J. Wong
parent bf4a5cfffe
commit 0f89edcd8e
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -298,6 +298,13 @@ xfs_attr_set_args(
if (error != -ENOSPC) if (error != -ENOSPC)
return error; return error;
/*
* Promote the attribute list to the Btree format.
*/
error = xfs_attr3_leaf_to_node(args);
if (error)
return error;
/* /*
* Finish any deferred work items and roll the transaction once * Finish any deferred work items and roll the transaction once
* more. The goal here is to call node_addname with the inode * more. The goal here is to call node_addname with the inode
@ -603,7 +610,7 @@ xfs_attr_leaf_try_add(
struct xfs_da_args *args, struct xfs_da_args *args,
struct xfs_buf *bp) struct xfs_buf *bp)
{ {
int retval, error; int retval;
/* /*
* Look up the given attribute in the leaf block. Figure out if * Look up the given attribute in the leaf block. Figure out if
@ -635,20 +642,10 @@ xfs_attr_leaf_try_add(
} }
/* /*
* Add the attribute to the leaf block, transitioning to a Btree * Add the attribute to the leaf block
* if required.
*/ */
retval = xfs_attr3_leaf_add(bp, args); return xfs_attr3_leaf_add(bp, args);
if (retval == -ENOSPC) {
/*
* Promote the attribute list to the Btree format. Unless an
* error occurs, retain the -ENOSPC retval
*/
error = xfs_attr3_leaf_to_node(args);
if (error)
return error;
}
return retval;
out_brelse: out_brelse:
xfs_trans_brelse(args->trans, bp); xfs_trans_brelse(args->trans, bp);
return retval; return retval;