Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / fs / xfs / xfs_attr_list.c

diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c
index 90e2eeb2120758e24c5bf466ca80f98b6129ef9e..62db83ab6cbc5e45f7dc1527738897b653c98e0f 100644 (file)
--- a/fs/xfs/xfs_attr_list.c
+++ b/fs/xfs/xfs_attr_list.c
@@ -50,11 +50,11 @@ xfs_attr_shortform_compare(const void *a, const void *b)
        sa = (xfs_attr_sf_sort_t *)a;
        sb = (xfs_attr_sf_sort_t *)b;
        if (sa->hash < sb->hash) {
-               return(-1);
+               return -1;
        } else if (sa->hash > sb->hash) {
-               return(1);
+               return 1;
        } else {
-               return(sa->entno - sb->entno);
+               return sa->entno - sb->entno;
        }
 }
 
@@ -86,7 +86,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
        sf = (xfs_attr_shortform_t *)dp->i_afp->if_u1.if_data;
        ASSERT(sf != NULL);
        if (!sf->hdr.count)
-               return(0);
+               return 0;
        cursor = context->cursor;
        ASSERT(cursor != NULL);
 
@@ -124,7 +124,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
                        sfe = XFS_ATTR_SF_NEXTENTRY(sfe);
                }
                trace_xfs_attr_list_sf_all(context);
-               return(0);
+               return 0;
        }
 
        /* do no more for a search callback */
@@ -150,7 +150,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
                                             XFS_ERRLEVEL_LOW,
                                             context->dp->i_mount, sfe);
                        kmem_free(sbuf);
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return -EFSCORRUPTED;
                }
 
                sbp->entno = i;
@@ -188,7 +188,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
        }
        if (i == nsbuf) {
                kmem_free(sbuf);
-               return(0);
+               return 0;
        }
 
        /*
@@ -213,7 +213,7 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context)
        }
 
        kmem_free(sbuf);
-       return(0);
+       return 0;
 }
 
 STATIC int
@@ -243,8 +243,8 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
        if (cursor->blkno > 0) {
                error = xfs_da3_node_read(NULL, dp, cursor->blkno, -1,
                                              &bp, XFS_ATTR_FORK);
-               if ((error != 0) && (error != EFSCORRUPTED))
-                       return(error);
+               if ((error != 0) && (error != -EFSCORRUPTED))
+                       return error;
                if (bp) {
                        struct xfs_attr_leaf_entry *entries;
 
@@ -295,7 +295,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                                      cursor->blkno, -1, &bp,
                                                      XFS_ATTR_FORK);
                        if (error)
-                               return(error);
+                               return error;
                        node = bp->b_addr;
                        magic = be16_to_cpu(node->hdr.info.magic);
                        if (magic == XFS_ATTR_LEAF_MAGIC ||
@@ -308,7 +308,7 @@ xfs_attr_node_list(xfs_attr_list_context_t *context)
                                                     context->dp->i_mount,
                                                     node);
                                xfs_trans_brelse(NULL, bp);
-                               return XFS_ERROR(EFSCORRUPTED);
+                               return -EFSCORRUPTED;
                        }
 
                        dp->d_ops->node_hdr_from_disk(&nodehdr, node);
@@ -496,11 +496,11 @@ xfs_attr_leaf_list(xfs_attr_list_context_t *context)
        context->cursor->blkno = 0;
        error = xfs_attr3_leaf_read(NULL, context->dp, 0, -1, &bp);
        if (error)
-               return XFS_ERROR(error);
+               return error;
 
        error = xfs_attr3_leaf_list_int(bp, context);
        xfs_trans_brelse(NULL, bp);
-       return XFS_ERROR(error);
+       return error;
 }
 
 int
@@ -514,7 +514,7 @@ xfs_attr_list_int(
        XFS_STATS_INC(xs_attr_list);
 
        if (XFS_FORCED_SHUTDOWN(dp->i_mount))
-               return EIO;
+               return -EIO;
 
        /*
         * Decide on what work routines to call based on the inode size.
@@ -616,16 +616,16 @@ xfs_attr_list(
         * Validate the cursor.
         */
        if (cursor->pad1 || cursor->pad2)
-               return(XFS_ERROR(EINVAL));
+               return -EINVAL;
        if ((cursor->initted == 0) &&
            (cursor->hashval || cursor->blkno || cursor->offset))
-               return XFS_ERROR(EINVAL);
+               return -EINVAL;
 
        /*
         * Check for a properly aligned buffer.
         */
        if (((long)buffer) & (sizeof(int)-1))
-               return XFS_ERROR(EFAULT);
+               return -EFAULT;
        if (flags & ATTR_KERNOVAL)
                bufsize = 0;
 
@@ -648,6 +648,6 @@ xfs_attr_list(
        alist->al_offset[0] = context.bufsize;
 
        error = xfs_attr_list_int(&context);
-       ASSERT(error >= 0);
+       ASSERT(error <= 0);
        return error;
 }