]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: remove unnecessary indenting from xfs_attr3_leaf_getvalue
authorDave Chinner <dchinner@redhat.com>
Fri, 13 Dec 2019 00:54:33 +0000 (19:54 -0500)
committerEric Sandeen <sandeen@redhat.com>
Fri, 13 Dec 2019 00:54:33 +0000 (19:54 -0500)
Source kernel commit: a0e959d3c9d52a83e01a97ef352a1465550f9329

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

index 63a7a3096a849ff8da80d388e68e3475d4e9d3c7..67cf3dc824c1d4c93f0171f70f7699fdf5642e04 100644 (file)
@@ -2387,24 +2387,25 @@ xfs_attr3_leaf_getvalue(
                }
                args->valuelen = valuelen;
                memcpy(args->value, &name_loc->nameval[args->namelen], valuelen);
-       } else {
-               name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index);
-               ASSERT(name_rmt->namelen == args->namelen);
-               ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0);
-               args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);
-               args->rmtblkno = be32_to_cpu(name_rmt->valueblk);
-               args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount,
-                                                      args->rmtvaluelen);
-               if (args->flags & ATTR_KERNOVAL) {
-                       args->valuelen = args->rmtvaluelen;
-                       return 0;
-               }
-               if (args->valuelen < args->rmtvaluelen) {
-                       args->valuelen = args->rmtvaluelen;
-                       return -ERANGE;
-               }
+               return 0;
+       }
+
+       name_rmt = xfs_attr3_leaf_name_remote(leaf, args->index);
+       ASSERT(name_rmt->namelen == args->namelen);
+       ASSERT(memcmp(args->name, name_rmt->name, args->namelen) == 0);
+       args->rmtvaluelen = be32_to_cpu(name_rmt->valuelen);
+       args->rmtblkno = be32_to_cpu(name_rmt->valueblk);
+       args->rmtblkcnt = xfs_attr3_rmt_blocks(args->dp->i_mount,
+                                              args->rmtvaluelen);
+       if (args->flags & ATTR_KERNOVAL) {
+               args->valuelen = args->rmtvaluelen;
+               return 0;
+       }
+       if (args->valuelen < args->rmtvaluelen) {
                args->valuelen = args->rmtvaluelen;
+               return -ERANGE;
        }
+       args->valuelen = args->rmtvaluelen;
        return 0;
 }