xfs: clean up the ATTR_REPLACE checks

Source kernel commit: f3e93d95feef7655a980be83a3b1830e8e1711a1

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 52429827b75eefc01fba31b0ab441c478aa10b3d..f3176ac47e5c8e02c31f14f00c7fa60999f1ef47 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -423,9 +423,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 (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
                return retval;
-       } else if (retval == -EEXIST) {
+       if (retval == -EEXIST) {
                if (args->flags & ATTR_CREATE)
                        return retval;
                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.
         */
        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 (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
+               goto out_brelse;
+       if (retval == -EEXIST) {
+               if (args->flags & ATTR_CREATE)  /* pure create op */
+                       goto out_brelse;
 
                trace_xfs_attr_leaf_replace(args);
 
@@ -637,6 +634,9 @@ xfs_attr_leaf_addname(
                error = xfs_attr3_leaf_clearflag(args);
        }
        return error;
+out_brelse:
+       xfs_trans_brelse(args->trans, bp);
+       return retval;
 }
 
 /*
@@ -763,9 +763,9 @@ restart:
                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 (retval == -ENOATTR && (args->flags & ATTR_REPLACE))
                goto out;
-       } else if (retval == -EEXIST) {
+       if (retval == -EEXIST) {
                if (args->flags & ATTR_CREATE)
                        goto out;