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>

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index faaf716..eb67f41 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -308,14 +308,14 @@ xfs_map_blocks(
        int                     nimaps = 1;
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return -XFS_ERROR(EIO);
+               return -EIO;
 
        if (type == XFS_IO_UNWRITTEN)
                bmapi_flags |= XFS_BMAPI_IGSTATE;
 
        if (!xfs_ilock_nowait(ip, XFS_ILOCK_SHARED)) {
                if (nonblocking)
-                       return -XFS_ERROR(EAGAIN);
+                       return -EAGAIN;
                xfs_ilock(ip, XFS_ILOCK_SHARED);
        }
 
@@ -332,14 +332,14 @@ xfs_map_blocks(
        xfs_iunlock(ip, XFS_ILOCK_SHARED);
 
        if (error)
-               return -XFS_ERROR(error);
+               return -error;
 
        if (type == XFS_IO_DELALLOC &&
            (!nimaps || isnullstartblock(imap->br_startblock))) {
                error = xfs_iomap_write_allocate(ip, offset, imap);
                if (!error)
                        trace_xfs_map_blocks_alloc(ip, offset, count, type, imap);
-               return -XFS_ERROR(error);
+               return -error;
        }
 
 #ifdef DEBUG
@@ -1253,7 +1253,7 @@ __xfs_get_blocks(
        int                     new = 0;
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return -XFS_ERROR(EIO);
+               return -EIO;
 
        offset = (xfs_off_t)iblock << inode->i_blkbits;
        ASSERT(bh_result->b_size >= (1 << inode->i_blkbits));

diff --cc fs/xfs/xfs_attr.c
Simple merge

diff --cc fs/xfs/xfs_attr_inactive.c
Simple merge

diff --cc fs/xfs/xfs_attr_leaf.c
Simple merge

diff --cc fs/xfs/xfs_attr_list.c
Simple merge

diff --cc fs/xfs/xfs_bmap.c
Simple merge

diff --cc fs/xfs/xfs_bmap_btree.c
Simple merge

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_btree.c
Simple merge

diff --cc fs/xfs/xfs_da_btree.c
Simple merge

diff --cc fs/xfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/xfs_dir2_block.c
Simple merge

diff --cc fs/xfs/xfs_dir2_leaf.c
Simple merge

diff --cc fs/xfs/xfs_dir2_node.c
Simple merge

diff --cc fs/xfs/xfs_dir2_readdir.c
Simple merge

diff --cc fs/xfs/xfs_dir2_sf.c
Simple merge

diff --cc fs/xfs/xfs_discard.c
Simple merge

diff --cc fs/xfs/xfs_dquot.c
Simple merge

diff --cc fs/xfs/xfs_error.c
Simple merge

diff --cc fs/xfs/xfs_error.h
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_fsops.c
Simple merge

diff --cc fs/xfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/xfs_icache.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_inode_buf.c
Simple merge

diff --cc fs/xfs/xfs_inode_fork.c
Simple merge

diff --cc fs/xfs/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/xfs_ioctl32.c
Simple merge

diff --cc fs/xfs/xfs_iomap.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
Simple merge

diff --cc fs/xfs/xfs_itable.c
Simple merge

diff --cc fs/xfs/xfs_log.c
Simple merge

diff --cc fs/xfs/xfs_log_cil.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge

diff --cc fs/xfs/xfs_qm.c
Simple merge

diff --cc fs/xfs/xfs_qm_bhv.c
Simple merge

diff --cc fs/xfs/xfs_qm_syscalls.c
Simple merge

diff --cc fs/xfs/xfs_rtalloc.c
Simple merge

diff --cc fs/xfs/xfs_sb.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge

diff --cc fs/xfs/xfs_symlink.c
Simple merge

diff --cc fs/xfs/xfs_trans.c
Simple merge

diff --cc fs/xfs/xfs_trans_buf.c
Simple merge