iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfs: clean up the ATTR_REPLACE checks

Browse Source 
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>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Christoph Hellwig 2020-02-26 17:30:42 -08:00 committed by Darrick J. Wong
parent 5a3930e27e
commit f3e93d95fe
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -423,9 +423,9 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
trace_xfs_attr_sf_addname(args); trace_xfs_attr_sf_addname(args);
retval = xfs_attr_shortform_lookup(args); retval = xfs_attr_shortform_lookup(args);
if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) { if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
return retval; return retval;
} else if (retval == -EEXIST) { if (retval == -EEXIST) {
if (args->flags & ATTR_CREATE) if (args->flags & ATTR_CREATE)
return retval; return retval;
retval = xfs_attr_shortform_remove(args); retval = xfs_attr_shortform_remove(args);
@ -489,14 +489,11 @@ xfs_attr_leaf_addname(
* the given flags produce an error or call for an atomic rename. * the given flags produce an error or call for an atomic rename.
*/ */
retval = xfs_attr3_leaf_lookup_int(bp, args); retval = xfs_attr3_leaf_lookup_int(bp, args);
if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) { if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
xfs_trans_brelse(args->trans, bp); goto out_brelse;
return retval; if (retval == -EEXIST) {
} else if (retval == -EEXIST) { if (args->flags & ATTR_CREATE) /* pure create op */
if (args->flags & ATTR_CREATE) { /* pure create op */ goto out_brelse;
xfs_trans_brelse(args->trans, bp);
return retval;
}
trace_xfs_attr_leaf_replace(args); trace_xfs_attr_leaf_replace(args);
@ -637,6 +634,9 @@ xfs_attr_leaf_addname(
error = xfs_attr3_leaf_clearflag(args); error = xfs_attr3_leaf_clearflag(args);
} }
return error; return error;
out_brelse:
xfs_trans_brelse(args->trans, bp);
return retval;
} }
/* /*
@ -763,9 +763,9 @@ restart:
goto out; goto out;
blk = &state->path.blk[ state->path.active-1 ]; blk = &state->path.blk[ state->path.active-1 ];
ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC); ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
if ((args->flags & ATTR_REPLACE) && (retval == -ENOATTR)) { if (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
goto out; goto out;
} else if (retval == -EEXIST) { if (retval == -EEXIST) {
if (args->flags & ATTR_CREATE) if (args->flags & ATTR_CREATE)
goto out; goto out;