Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/ac97' and 'asoc/topic...

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

diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c
index 09480c57f06900ccb5fdba4817d561908f0deb1e..aa2a8b1838a2939d62ef104a25b4a4f98f1b9020 100644 (file)
--- a/fs/xfs/xfs_attr_inactive.c
+++ b/fs/xfs/xfs_attr_inactive.c
@@ -76,7 +76,7 @@ xfs_attr3_leaf_freextent(
                error = xfs_bmapi_read(dp, (xfs_fileoff_t)tblkno, tblkcnt,
                                       &map, &nmap, XFS_BMAPI_ATTRFORK);
                if (error) {
-                       return(error);
+                       return error;
                }
                ASSERT(nmap == 1);
                ASSERT(map.br_startblock != DELAYSTARTBLOCK);
@@ -95,21 +95,21 @@ xfs_attr3_leaf_freextent(
                                        dp->i_mount->m_ddev_targp,
                                        dblkno, dblkcnt, 0);
                        if (!bp)
-                               return ENOMEM;
+                               return -ENOMEM;
                        xfs_trans_binval(*trans, bp);
                        /*
                         * Roll to next transaction.
                         */
                        error = xfs_trans_roll(trans, dp);
                        if (error)
-                               return (error);
+                               return error;
                }
 
                tblkno += map.br_blockcount;
                tblkcnt -= map.br_blockcount;
        }
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -227,7 +227,7 @@ xfs_attr3_node_inactive(
         */
        if (level > XFS_DA_NODE_MAXDEPTH) {
                xfs_trans_brelse(*trans, bp);   /* no locks for later trans */
-               return XFS_ERROR(EIO);
+               return -EIO;
        }
 
        node = bp->b_addr;
@@ -256,7 +256,7 @@ xfs_attr3_node_inactive(
                error = xfs_da3_node_read(*trans, dp, child_fsb, -2, &child_bp,
                                                XFS_ATTR_FORK);
                if (error)
-                       return(error);
+                       return error;
                if (child_bp) {
                                                /* save for re-read later */
                        child_blkno = XFS_BUF_ADDR(child_bp);
@@ -277,7 +277,7 @@ xfs_attr3_node_inactive(
                                                        child_bp);
                                break;
                        default:
-                               error = XFS_ERROR(EIO);
+                               error = -EIO;
                                xfs_trans_brelse(*trans, child_bp);
                                break;
                        }
@@ -360,7 +360,7 @@ xfs_attr3_root_inactive(
                error = xfs_attr3_leaf_inactive(trans, dp, bp);
                break;
        default:
-               error = XFS_ERROR(EIO);
+               error = -EIO;
                xfs_trans_brelse(*trans, bp);
                break;
        }
@@ -414,7 +414,7 @@ xfs_attr_inactive(xfs_inode_t *dp)
        error = xfs_trans_reserve(trans, &M_RES(mp)->tr_attrinval, 0, 0);
        if (error) {
                xfs_trans_cancel(trans, 0);
-               return(error);
+               return error;
        }
        xfs_ilock(dp, XFS_ILOCK_EXCL);
 
@@ -443,10 +443,10 @@ xfs_attr_inactive(xfs_inode_t *dp)
        error = xfs_trans_commit(trans, XFS_TRANS_RELEASE_LOG_RES);
        xfs_iunlock(dp, XFS_ILOCK_EXCL);
 
-       return(error);
+       return error;
 
 out:
        xfs_trans_cancel(trans, XFS_TRANS_RELEASE_LOG_RES|XFS_TRANS_ABORT);
        xfs_iunlock(dp, XFS_ILOCK_EXCL);
-       return(error);
+       return error;
 }