[PATCH 30/33] xfs: clean up the ATTR_REPLACE checks

Christoph Hellwig
2019-12-12T10:55:48Z

Remove superflous braces, elses after return statements and use a goto
label to merge common error handling.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/xfs/libxfs/xfs_attr.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index fce4fd4a3370..3b29cdeecb64 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -419,9 +419,9 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
trace_xfs_attr_sf_addname(args);

retval = xfs_attr_shortform_lookup(args);
- if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {
+ if ((args->flags & ATTR_REPLACE) && retval == -ENOATTR)
return retval;
- } else if (retval == -EEXIST) {
+ if (retval == -EEXIST) {
if (args->flags & ATTR_CREATE)
return retval;
retval = xfs_attr_shortform_remove(args);
@@ -485,14 +485,11 @@ xfs_attr_leaf_addname(
* the given flags produce an error or call for an atomic rename.
*/
retval = xfs_attr3_leaf_lookup_int(bp, args);
- if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {
- xfs_trans_brelse(args->trans, bp);
- return retval;
- } else if (retval == -EEXIST) {
- if (args->flags & ATTR_CREATE) { /* pure create op */
- xfs_trans_brelse(args->trans, bp);
- return retval;
- }
+ if ((args->flags & ATTR_REPLACE) && retval == -ENOATTR)
+ goto out_brelse;
+ if (retval == -EEXIST) {
+ if (args->flags & ATTR_CREATE) /* pure create op */
+ goto out_brelse;

trace_xfs_attr_leaf_replace(args);

@@ -633,6 +630,9 @@ xfs_attr_leaf_addname(
error = xfs_attr3_leaf_clearflag(args);
}
return error;
+out_brelse:
+ xfs_trans_brelse(args->trans, bp);
+ return retval;
}

/*
@@ -759,9 +759,9 @@ xfs_attr_node_addname(
goto out;
blk = &state->path.blk[ state->path.active-1 ];
ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
- if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) {
+ if ((args->flags & ATTR_REPLACE) && retval == -ENOATTR)
goto out;
- } else if (retval == -EEXIST) {
+ if (retval == -EEXIST) {
if (args->flags & ATTR_CREATE)
goto out;

--
2.20.1