xfs: Nuke XFS_ERROR macro

XFS_ERROR was designed long ago to trap return values, but it's not
runtime configurable, it's not consistently used, and we can do
similar error trapping with ftrace scripts and triggers from
userspace.

Just nuke XFS_ERROR and associated bits.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c
index c7cd3154026a..ab0bffccf5c3 100644
--- a/fs/xfs/xfs_dir2_block.c
+++ b/fs/xfs/xfs_dir2_block.c
@@ -392,7 +392,7 @@ xfs_dir2_block_addname(
         if (args->op_flags & XFS_DA_OP_JUSTCHECK) {
                 xfs_trans_brelse(tp, bp);
                 if (!dup)
-                        return XFS_ERROR(ENOSPC);
+                        return ENOSPC;
                 return 0;
         }
 
@@ -402,7 +402,7 @@ xfs_dir2_block_addname(
         if (!dup) {
                 /* Don't have a space reservation: return no-space.  */
                 if (args->total == 0)
-                        return XFS_ERROR(ENOSPC);
+                        return ENOSPC;
                 /*
                  * Convert to the next larger format.
                  * Then add the new entry in that format.
@@ -647,7 +647,7 @@ xfs_dir2_block_lookup(
         args->filetype = dp->d_ops->data_get_ftype(dep);
         error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);
         xfs_trans_brelse(args->trans, bp);
-        return XFS_ERROR(error);
+        return error;
 }
 
 /*
@@ -703,7 +703,7 @@ xfs_dir2_block_lookup_int(
                 if (low > high) {
                         ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
                         xfs_trans_brelse(tp, bp);
-                        return XFS_ERROR(ENOENT);
+                        return ENOENT;
                 }
         }
         /*
@@ -751,7 +751,7 @@ xfs_dir2_block_lookup_int(
          * No match, release the buffer and return ENOENT.
          */
         xfs_trans_brelse(tp, bp);
-        return XFS_ERROR(ENOENT);
+        return ENOENT;
 }
 
 /*
@@ -1091,7 +1091,7 @@ xfs_dir2_sf_to_block(
          */
         if (dp->i_d.di_size < offsetof(xfs_dir2_sf_hdr_t, parent)) {
                 ASSERT(XFS_FORCED_SHUTDOWN(mp));
-                return XFS_ERROR(EIO);
+                return EIO;
         }
 
         oldsfp = (xfs_dir2_sf_hdr_t *)ifp->if_u1.if_data;