mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 11:50:52 +07:00
xfs: move remote attr retrieval into xfs_attr3_leaf_getvalue
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:
parent
a0e959d3c9
commit
e3cc4554ce
@ -794,15 +794,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args)
|
||||
}
|
||||
error = xfs_attr3_leaf_getvalue(bp, args);
|
||||
xfs_trans_brelse(args->trans, bp);
|
||||
if (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);
|
||||
return error;
|
||||
}
|
||||
|
||||
/*========================================================================
|
||||
@ -1316,12 +1308,6 @@ xfs_attr_node_get(xfs_da_args_t *args)
|
||||
*/
|
||||
blk = &state->path.blk[state->path.active - 1];
|
||||
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.
|
||||
|
@ -2410,7 +2410,7 @@ xfs_attr3_leaf_getvalue(
|
||||
return -ERANGE;
|
||||
}
|
||||
args->valuelen = args->rmtvaluelen;
|
||||
return 0;
|
||||
return xfs_attr_rmtval_get(args);
|
||||
}
|
||||
|
||||
/*========================================================================
|
||||
|
Loading…
Reference in New Issue
Block a user