Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5677', 'asoc/topic...

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

diff --git a/fs/xfs/xfs_trans_buf.c b/fs/xfs/xfs_trans_buf.c
index b8eef0549f3f9a39cc68d06cf7a9cbcb04af469f..96c898e7ac9a7af67f0ab5a6147c7ba9f01cf4b9 100644 (file)
--- a/fs/xfs/xfs_trans_buf.c
+++ b/fs/xfs/xfs_trans_buf.c
@@ -166,7 +166,7 @@ xfs_trans_get_buf_map(
                ASSERT(atomic_read(&bip->bli_refcount) > 0);
                bip->bli_recur++;
                trace_xfs_trans_get_buf_recur(bip);
-               return (bp);
+               return bp;
        }
 
        bp = xfs_buf_get_map(target, map, nmaps, flags);
@@ -178,7 +178,7 @@ xfs_trans_get_buf_map(
 
        _xfs_trans_bjoin(tp, bp, 1);
        trace_xfs_trans_get_buf(bp->b_fspriv);
-       return (bp);
+       return bp;
 }
 
 /*
@@ -201,9 +201,8 @@ xfs_trans_getsb(xfs_trans_t *tp,
         * Default to just trying to lock the superblock buffer
         * if tp is NULL.
         */
-       if (tp == NULL) {
-               return (xfs_getsb(mp, flags));
-       }
+       if (tp == NULL)
+               return xfs_getsb(mp, flags);
 
        /*
         * If the superblock buffer already has this transaction
@@ -218,7 +217,7 @@ xfs_trans_getsb(xfs_trans_t *tp,
                ASSERT(atomic_read(&bip->bli_refcount) > 0);
                bip->bli_recur++;
                trace_xfs_trans_getsb_recur(bip);
-               return (bp);
+               return bp;
        }
 
        bp = xfs_getsb(mp, flags);
@@ -227,7 +226,7 @@ xfs_trans_getsb(xfs_trans_t *tp,
 
        _xfs_trans_bjoin(tp, bp, 1);
        trace_xfs_trans_getsb(bp->b_fspriv);
-       return (bp);
+       return bp;
 }
 
 #ifdef DEBUG
@@ -267,7 +266,7 @@ xfs_trans_read_buf_map(
                bp = xfs_buf_read_map(target, map, nmaps, flags, ops);
                if (!bp)
                        return (flags & XBF_TRYLOCK) ?
-                                       EAGAIN : XFS_ERROR(ENOMEM);
+                                       -EAGAIN : -ENOMEM;
 
                if (bp->b_error) {
                        error = bp->b_error;
@@ -277,8 +276,8 @@ xfs_trans_read_buf_map(
                        xfs_buf_relse(bp);
 
                        /* bad CRC means corrupted metadata */
-                       if (error == EFSBADCRC)
-                               error = EFSCORRUPTED;
+                       if (error == -EFSBADCRC)
+                               error = -EFSCORRUPTED;
                        return error;
                }
 #ifdef DEBUG
@@ -287,7 +286,7 @@ xfs_trans_read_buf_map(
                                if (((xfs_req_num++) % xfs_error_mod) == 0) {
                                        xfs_buf_relse(bp);
                                        xfs_debug(mp, "Returning error!");
-                                       return XFS_ERROR(EIO);
+                                       return -EIO;
                                }
                        }
                }
@@ -343,8 +342,8 @@ xfs_trans_read_buf_map(
                                        xfs_force_shutdown(tp->t_mountp,
                                                        SHUTDOWN_META_IO_ERROR);
                                /* bad CRC means corrupted metadata */
-                               if (error == EFSBADCRC)
-                                       error = EFSCORRUPTED;
+                               if (error == -EFSBADCRC)
+                                       error = -EFSCORRUPTED;
                                return error;
                        }
                }
@@ -355,7 +354,7 @@ xfs_trans_read_buf_map(
                if (XFS_FORCED_SHUTDOWN(mp)) {
                        trace_xfs_trans_read_buf_shut(bp, _RET_IP_);
                        *bpp = NULL;
-                       return XFS_ERROR(EIO);
+                       return -EIO;
                }
 
 
@@ -372,7 +371,7 @@ xfs_trans_read_buf_map(
        if (bp == NULL) {
                *bpp = NULL;
                return (flags & XBF_TRYLOCK) ?
-                                       0 : XFS_ERROR(ENOMEM);
+                                       0 : -ENOMEM;
        }
        if (bp->b_error) {
                error = bp->b_error;
@@ -384,8 +383,8 @@ xfs_trans_read_buf_map(
                xfs_buf_relse(bp);
 
                /* bad CRC means corrupted metadata */
-               if (error == EFSBADCRC)
-                       error = EFSCORRUPTED;
+               if (error == -EFSBADCRC)
+                       error = -EFSCORRUPTED;
                return error;
        }
 #ifdef DEBUG
@@ -396,7 +395,7 @@ xfs_trans_read_buf_map(
                                                   SHUTDOWN_META_IO_ERROR);
                                xfs_buf_relse(bp);
                                xfs_debug(mp, "Returning trans error!");
-                               return XFS_ERROR(EIO);
+                               return -EIO;
                        }
                }
        }
@@ -414,7 +413,7 @@ shutdown_abort:
        trace_xfs_trans_read_buf_shut(bp, _RET_IP_);
        xfs_buf_relse(bp);
        *bpp = NULL;
-       return XFS_ERROR(EIO);
+       return -EIO;
 }
 
 /*