leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfs: move remote attr retrieval into xfs_attr3_leaf_getvalue

Browse Source 
Because we repeat exactly the same code to get the remote attribute
value after both calls to xfs_attr3_leaf_getvalue() if it's a remote
attr. Just do it in xfs_attr3_leaf_getvalue() so the callers don't
have to care about it.

Signed-off-by: Dave Chinner <dchinner@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:
Dave Chinner 2019-08-29 09:04:09 -07:00 committed by Darrick J. Wong
parent a0e959d3c9
commit e3cc4554ce
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,15 +794,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args)
} }
error = xfs_attr3_leaf_getvalue(bp, args); error = xfs_attr3_leaf_getvalue(bp, args);
xfs_trans_brelse(args->trans, bp); xfs_trans_brelse(args->trans, bp);
if (error) return error;
return error;
/* check if we have to retrieve a remote attribute to get the value */
if (args->flags & ATTR_KERNOVAL)
return 0;
if (!args->rmtblkno)
return 0;
return xfs_attr_rmtval_get(args);
} }
/*======================================================================== /*========================================================================
@ -1316,12 +1308,6 @@ xfs_attr_node_get(xfs_da_args_t *args)
*/ */
blk = &state->path.blk[state->path.active - 1]; blk = &state->path.blk[state->path.active - 1];
retval = xfs_attr3_leaf_getvalue(blk->bp, args); retval = xfs_attr3_leaf_getvalue(blk->bp, args);
if (retval)
goto out_release;
if (args->flags & ATTR_KERNOVAL)
goto out_release;
if (args->rmtblkno > 0)
retval = xfs_attr_rmtval_get(args);
/* /*
* If not in a transaction, we have to release all the buffers. * If not in a transaction, we have to release all the buffers.

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

@ -2410,7 +2410,7 @@ xfs_attr3_leaf_getvalue(
return -ERANGE; return -ERANGE;
} }
args->valuelen = args->rmtvaluelen; args->valuelen = args->rmtvaluelen;
return 0; return xfs_attr_rmtval_get(args);
} }
/*======================================================================== /*========================================================================