]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
xfs: Nuke XFS_ERROR macro
authorDave Chinner <dchinner@redhat.com>
Thu, 30 Jul 2015 22:33:08 +0000 (08:33 +1000)
committerDave Chinner <david@fromorbit.com>
Thu, 30 Jul 2015 22:33:08 +0000 (08:33 +1000)
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.

Port of kernel commit b474c7ae4395ba684e85fde8f55c8cf44a39afaf
from Eric Sandeen.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
18 files changed:
libxfs/trans.c
libxfs/util.c
libxfs/xfs.h
libxfs/xfs_attr.c
libxfs/xfs_attr_leaf.c
libxfs/xfs_bmap.c
libxfs/xfs_bmap_btree.c
libxfs/xfs_btree.c
libxfs/xfs_da_btree.c
libxfs/xfs_dir2.c
libxfs/xfs_dir2_block.c
libxfs/xfs_dir2_leaf.c
libxfs/xfs_dir2_node.c
libxfs/xfs_dir2_sf.c
libxfs/xfs_ialloc.c
libxfs/xfs_inode_buf.c
libxfs/xfs_inode_fork.c
libxfs/xfs_sb.c

index dcd10d87061906478fb224420eb47f0a78728929..4c075be2e1e3e480a72c9cd2b093ef7f404bba0d 100644 (file)
@@ -560,8 +560,7 @@ libxfs_trans_read_buf_map(
        if (tp == NULL) {
                bp = libxfs_readbuf_map(btp, map, nmaps, flags, ops);
                if (!bp) {
-                       return (flags & XBF_TRYLOCK) ?
-                               EAGAIN : XFS_ERROR(ENOMEM);
+                       return (flags & XBF_TRYLOCK) ?  EAGAIN : ENOMEM;
                }
                if (bp->b_error)
                        goto out_relse;
@@ -579,8 +578,7 @@ libxfs_trans_read_buf_map(
 
        bp = libxfs_readbuf_map(btp, map, nmaps, flags, ops);
        if (!bp) {
-               return (flags & XBF_TRYLOCK) ?
-                       EAGAIN : XFS_ERROR(ENOMEM);
+               return (flags & XBF_TRYLOCK) ?  EAGAIN : ENOMEM;
        }
        if (bp->b_error)
                goto out_relse;
index 653592fbadced3388deb1ea05d9e6a6846b426f3..d1d0200294fef3e88b76b3a843e137baf755c056 100644 (file)
@@ -476,12 +476,12 @@ libxfs_mod_incore_sb(
                lcounter = (long long)mp->m_sb.sb_fdblocks;
                lcounter += delta;
                if (lcounter < 0)
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
                mp->m_sb.sb_fdblocks = lcounter;
                return 0;
        default:
                ASSERT(0);
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
 }
 
@@ -649,7 +649,7 @@ libxfs_inode_alloc(
        }
        if (!ialloc_context && !ip) {
                *ipp = NULL;
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
        }
 
        if (ialloc_context) {
index cc6e3c5ddb09c8cae897bffa3aa5fb2992bcb9cc..8f3842611cd1eec0628b338741018d2e2471928e 100644 (file)
@@ -235,7 +235,6 @@ typedef struct xfs_bmalloca {
 } while (0)
 
 #define XFS_QM_DQATTACH(mp,ip,flags)   0
-#define XFS_ERROR(e)                   (e)
 #define XFS_ERRLEVEL_LOW               1
 #define XFS_FORCED_SHUTDOWN(mp)                0
 #define XFS_ILOCK_EXCL                 0
index 105276d971ec26db754d4a7f263777be1052140d..766aefd3fad21b6a3745bd2385e52c8252f8c696 100644 (file)
@@ -451,7 +451,7 @@ xfs_attr_remove(
        xfs_trans_ijoin(args.trans, dp, 0);
 
        if (!xfs_inode_hasattr(dp)) {
-               error = XFS_ERROR(ENOATTR);
+               error = ENOATTR;
        } else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
                ASSERT(dp->i_afp->if_flags & XFS_IFINLINE);
                error = xfs_attr_shortform_remove(&args);
@@ -519,14 +519,14 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
 
        if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
            args->valuelen >= XFS_ATTR_SF_ENTSIZE_MAX)
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
 
        newsize = XFS_ATTR_SF_TOTSIZE(args->dp);
        newsize += XFS_ATTR_SF_ENTSIZE_BYNAME(args->namelen, args->valuelen);
 
        forkoff = xfs_attr_shortform_bytesfit(args->dp, newsize);
        if (!forkoff)
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
 
        xfs_attr_shortform_add(args, forkoff);
        return 0;
index 104f6b16b0ced3b8e2e19679113fd91b77896129..678db2c4f620243ddf7ed2704a4da20a9f44fc04 100644 (file)
@@ -521,7 +521,7 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
                break;
        }
        if (i == end)
-               return XFS_ERROR(ENOATTR);
+               return ENOATTR;
 
        /*
         * Fix up the attribute fork data, covering the hole
@@ -585,9 +585,9 @@ xfs_attr_shortform_lookup(xfs_da_args_t *args)
                        continue;
                if (!xfs_attr_namesp_match(args->flags, sfe->flags))
                        continue;
-               return XFS_ERROR(EEXIST);
+               return EEXIST;
        }
-       return XFS_ERROR(ENOATTR);
+       return ENOATTR;
 }
 
 /*
@@ -614,18 +614,18 @@ xfs_attr_shortform_getvalue(xfs_da_args_t *args)
                        continue;
                if (args->flags & ATTR_KERNOVAL) {
                        args->valuelen = sfe->valuelen;
-                       return XFS_ERROR(EEXIST);
+                       return EEXIST;
                }
                if (args->valuelen < sfe->valuelen) {
                        args->valuelen = sfe->valuelen;
-                       return XFS_ERROR(ERANGE);
+                       return ERANGE;
                }
                args->valuelen = sfe->valuelen;
                memcpy(args->value, &sfe->nameval[args->namelen],
                                                    args->valuelen);
-               return XFS_ERROR(EEXIST);
+               return EEXIST;
        }
-       return XFS_ERROR(ENOATTR);
+       return ENOATTR;
 }
 
 /*
@@ -1082,7 +1082,7 @@ xfs_attr3_leaf_add(
         * no good and we should just give up.
         */
        if (!ichdr.holes && sum < entsize)
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
 
        /*
         * Compact the entries to coalesce free space.
@@ -2097,7 +2097,7 @@ xfs_attr3_leaf_lookup_int(
        }
        if (probe == ichdr.count || be32_to_cpu(entry->hashval) != hashval) {
                args->index = probe;
-               return XFS_ERROR(ENOATTR);
+               return ENOATTR;
        }
 
        /*
@@ -2126,7 +2126,7 @@ xfs_attr3_leaf_lookup_int(
                        if (!xfs_attr_namesp_match(args->flags, entry->flags))
                                continue;
                        args->index = probe;
-                       return XFS_ERROR(EEXIST);
+                       return EEXIST;
                } else {
                        name_rmt = xfs_attr3_leaf_name_remote(leaf, probe);
                        if (name_rmt->namelen != args->namelen)
@@ -2142,11 +2142,11 @@ xfs_attr3_leaf_lookup_int(
                        args->rmtblkcnt = xfs_attr3_rmt_blocks(
                                                        args->dp->i_mount,
                                                        args->rmtvaluelen);
-                       return XFS_ERROR(EEXIST);
+                       return EEXIST;
                }
        }
        args->index = probe;
-       return XFS_ERROR(ENOATTR);
+       return ENOATTR;
 }
 
 /*
@@ -2182,7 +2182,7 @@ xfs_attr3_leaf_getvalue(
                }
                if (args->valuelen < valuelen) {
                        args->valuelen = valuelen;
-                       return XFS_ERROR(ERANGE);
+                       return ERANGE;
                }
                args->valuelen = valuelen;
                memcpy(args->value, &name_loc->nameval[args->namelen], valuelen);
@@ -2200,7 +2200,7 @@ xfs_attr3_leaf_getvalue(
                }
                if (args->valuelen < args->rmtvaluelen) {
                        args->valuelen = args->rmtvaluelen;
-                       return XFS_ERROR(ERANGE);
+                       return ERANGE;
                }
                args->valuelen = args->rmtvaluelen;
        }
index c1fc5250a2b8143921307647a0d82522285fef33..fec59bc62c559930d502f18f9242ceb62d444299 100644 (file)
@@ -1000,7 +1000,7 @@ xfs_bmap_add_attrfork_btree(
                        goto error0;
                if (stat == 0) {
                        xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
                }
                *firstblock = cur->bc_private.b.firstblock;
                cur->bc_private.b.allocated = 0;
@@ -1159,7 +1159,7 @@ xfs_bmap_add_attrfork(
                break;
        default:
                ASSERT(0);
-               error = XFS_ERROR(EINVAL);
+               error = EINVAL;
                goto trans_cancel;
        }
 
@@ -1366,7 +1366,7 @@ xfs_bmap_read_extents(
        return 0;
 error0:
        xfs_trans_brelse(tp, bp);
-       return XFS_ERROR(EFSCORRUPTED);
+       return EFSCORRUPTED;
 }
 
 
@@ -1543,7 +1543,7 @@ xfs_bmap_last_before(
        if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE &&
            XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS &&
            XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_LOCAL)
-              return XFS_ERROR(EIO);
+              return EIO;
        if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL) {
                *last_block = 0;
                return 0;
@@ -1657,7 +1657,7 @@ xfs_bmap_last_offset(
 
        if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE &&
            XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS)
-              return XFS_ERROR(EIO);
+              return EIO;
 
        error = xfs_bmap_last_extent(NULL, ip, whichfork, &rec, &is_empty);
        if (error || is_empty)
@@ -3290,7 +3290,7 @@ xfs_bmap_extsize_align(
                if (orig_off < align_off ||
                    orig_end > align_off + align_alen ||
                    align_alen - temp < orig_alen)
-                       return XFS_ERROR(EINVAL);
+                       return EINVAL;
                /*
                 * Try to fix it by moving the start up.
                 */
@@ -3315,7 +3315,7 @@ xfs_bmap_extsize_align(
                 * Result doesn't cover the request, fail it.
                 */
                if (orig_off < align_off || orig_end > align_off + align_alen)
-                       return XFS_ERROR(EINVAL);
+                       return EINVAL;
        } else {
                ASSERT(orig_off >= align_off);
                ASSERT(orig_end <= align_off + align_alen);
@@ -4018,11 +4018,11 @@ xfs_bmapi_read(
             XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
             mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
                XFS_ERROR_REPORT("xfs_bmapi_read", XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
+               return EIO;
 
        XFS_STATS_INC(xs_blk_mapr);
 
@@ -4213,11 +4213,11 @@ xfs_bmapi_delay(
             XFS_IFORK_FORMAT(ip, XFS_DATA_FORK) != XFS_DINODE_FMT_BTREE),
             mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
                XFS_ERROR_REPORT("xfs_bmapi_delay", XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
+               return EIO;
 
        XFS_STATS_INC(xs_blk_mapw);
 
@@ -4507,11 +4507,11 @@ xfs_bmapi_write(
             XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE),
             mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
                XFS_ERROR_REPORT("xfs_bmapi_write", XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
+               return EIO;
 
        ifp = XFS_IFORK_PTR(ip, whichfork);
 
@@ -4925,7 +4925,7 @@ xfs_bmap_del_extent(
                                        xfs_bmbt_set_blockcount(ep,
                                                got.br_blockcount);
                                        flags = 0;
-                                       error = XFS_ERROR(ENOSPC);
+                                       error = ENOSPC;
                                        goto done;
                                }
                                XFS_WANT_CORRUPTED_GOTO(i == 1, done);
@@ -5043,11 +5043,11 @@ xfs_bunmapi(
            XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {
                XFS_ERROR_REPORT("xfs_bunmapi", XFS_ERRLEVEL_LOW,
                                 ip->i_mount);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        mp = ip->i_mount;
        if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
+               return EIO;
 
        ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL));
        ASSERT(len > 0);
@@ -5292,7 +5292,7 @@ xfs_bunmapi(
                    del.br_startoff > got.br_startoff &&
                    del.br_startoff + del.br_blockcount <
                    got.br_startoff + got.br_blockcount) {
-                       error = XFS_ERROR(ENOSPC);
+                       error = ENOSPC;
                        goto error0;
                }
                error = xfs_bmap_del_extent(ip, tp, &lastx, flist, cur, &del,
@@ -5416,11 +5416,11 @@ xfs_bmap_shift_extents(
             mp, XFS_ERRTAG_BMAPIFORMAT, XFS_RANDOM_BMAPIFORMAT))) {
                XFS_ERROR_REPORT("xfs_bmap_shift_extents",
                                 XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (XFS_FORCED_SHUTDOWN(mp))
-               return XFS_ERROR(EIO);
+               return EIO;
 
        ASSERT(current_ext != NULL);
 
@@ -5483,14 +5483,14 @@ xfs_bmap_shift_extents(
                                                *current_ext - 1), &left);
 
                        if (startoff < left.br_startoff + left.br_blockcount)
-                               error = XFS_ERROR(EINVAL);
+                               error = EINVAL;
                } else if (offset_shift_fsb > got.br_startoff) {
                        /*
                         * When first extent is shifted, offset_shift_fsb
                         * should be less than the stating offset of
                         * the first extent.
                         */
-                       error = XFS_ERROR(EINVAL);
+                       error = EINVAL;
                }
 
                if (error)
index 40a5ac3176f3d9c91d81a9a704824f1a6c4d4226..1fa20bdfce22c038b18954c0101d6ae003e9c035 100644 (file)
@@ -533,7 +533,7 @@ xfs_bmbt_alloc_block(
        args.minlen = args.maxlen = args.prod = 1;
        args.wasdel = cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL;
        if (!args.wasdel && xfs_trans_get_block_res(args.tp) == 0) {
-               error = XFS_ERROR(ENOSPC);
+               error = ENOSPC;
                goto error0;
        }
        error = xfs_alloc_vextent(&args);
index 9d1dd1cb6699a9eee67776835b41354fc18f781a..74697daf1766bc41c0fa09f26844194abd535c59 100644 (file)
@@ -75,7 +75,7 @@ xfs_btree_check_lblock(
                if (bp)
                        trace_xfs_btree_corrupt(bp, _RET_IP_);
                XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        return 0;
 }
@@ -123,7 +123,7 @@ xfs_btree_check_sblock(
                if (bp)
                        trace_xfs_btree_corrupt(bp, _RET_IP_);
                XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        return 0;
 }
index 9127784a51656b6b4ed065f6432ddccaf0a05639..95eb027e32b8967306219f72734039c2984c1e38 100644 (file)
@@ -1556,7 +1556,7 @@ xfs_da3_node_lookup_int(
                        args->blkno = blk->blkno;
                } else {
                        ASSERT(0);
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
                }
                if (((retval == ENOENT) || (retval == ENOATTR)) &&
                    (blk->hashval == args->hashval)) {
@@ -1568,7 +1568,7 @@ xfs_da3_node_lookup_int(
                                continue;
                        } else if (blk->magic == XFS_ATTR_LEAF_MAGIC) {
                                /* path_shift() gives ENOENT */
-                               retval = XFS_ERROR(ENOATTR);
+                               retval = ENOATTR;
                        }
                }
                break;
@@ -1836,7 +1836,7 @@ xfs_da3_path_shift(
                }
        }
        if (level < 0) {
-               *result = XFS_ERROR(ENOENT);    /* we're out of our tree */
+               *result = ENOENT;       /* we're out of our tree */
                ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
                return 0;
        }
@@ -2045,7 +2045,7 @@ xfs_da_grow_inode_int(
        if (got != count || mapp[0].br_startoff != *bno ||
            mapp[mapi - 1].br_startoff + mapp[mapi - 1].br_blockcount !=
            *bno + count) {
-               error = XFS_ERROR(ENOSPC);
+               error = ENOSPC;
                goto out_free_map;
        }
 
@@ -2135,7 +2135,7 @@ xfs_da3_swap_lastblock(
        if (unlikely(lastoff == 0)) {
                XFS_ERROR_REPORT("xfs_da_swap_lastblock(1)", XFS_ERRLEVEL_LOW,
                                 mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        /*
         * Read the last block in the btree space.
@@ -2186,7 +2186,7 @@ xfs_da3_swap_lastblock(
                    sib_info->magic != dead_info->magic)) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(2)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                sib_info->forw = cpu_to_be32(dead_blkno);
@@ -2208,7 +2208,7 @@ xfs_da3_swap_lastblock(
                       sib_info->magic != dead_info->magic)) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(3)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                sib_info->back = cpu_to_be32(dead_blkno);
@@ -2231,7 +2231,7 @@ xfs_da3_swap_lastblock(
                if (level >= 0 && level != par_hdr.level + 1) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(4)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                level = par_hdr.level;
@@ -2244,7 +2244,7 @@ xfs_da3_swap_lastblock(
                if (entno == par_hdr.count) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(5)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                par_blkno = be32_to_cpu(btree[entno].before);
@@ -2271,7 +2271,7 @@ xfs_da3_swap_lastblock(
                if (unlikely(par_blkno == 0)) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(6)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                error = xfs_da3_node_read(tp, dp, par_blkno, -1, &par_buf, w);
@@ -2282,7 +2282,7 @@ xfs_da3_swap_lastblock(
                if (par_hdr.level != level) {
                        XFS_ERROR_REPORT("xfs_da_swap_lastblock(7)",
                                         XFS_ERRLEVEL_LOW, mp);
-                       error = XFS_ERROR(EFSCORRUPTED);
+                       error = EFSCORRUPTED;
                        goto done;
                }
                btree = dp->d_ops->node_tree_p(par_node);
@@ -2477,7 +2477,7 @@ xfs_dabuf_map(
        }
 
        if (!xfs_da_map_covers_blocks(nirecs, irecs, bno, nfsb)) {
-               error = mappedbno == -2 ? -1 : XFS_ERROR(EFSCORRUPTED);
+               error = mappedbno == -2 ? -1 : EFSCORRUPTED;
                if (unlikely(error == EFSCORRUPTED)) {
                        if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
                                int i;
@@ -2538,7 +2538,7 @@ xfs_da_get_buf(
 
        bp = xfs_trans_get_buf_map(trans, dp->i_mount->m_ddev_targp,
                                    mapp, nmap, 0);
-       error = bp ? bp->b_error : XFS_ERROR(EIO);
+       error = bp ? bp->b_error : EIO;
        if (error) {
                xfs_trans_brelse(trans, bp);
                goto out_free;
index c406225ac9b6ed2a645863264a3b4ba5054d1510..248b7cafbb7f0a1b7fa14fc60e0f0b5977741144 100644 (file)
@@ -201,7 +201,7 @@ xfs_dir_ino_validate(
                xfs_warn(mp, "Invalid inode number 0x%Lx",
                                (unsigned long long) ino);
                XFS_ERROR_REPORT("xfs_dir_ino_validate", XFS_ERRLEVEL_LOW, mp);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        return 0;
 }
index 8be52cf14db5faab44cfb9e9376eaa7a3038bdb8..e910b5bf4f834518aaa1394753630386abc1d7dd 100644 (file)
@@ -373,7 +373,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;
        }
 
@@ -383,7 +383,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.
@@ -629,7 +629,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;
 }
 
 /*
@@ -685,7 +685,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;
                }
        }
        /*
@@ -733,7 +733,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;
 }
 
 /*
@@ -1073,7 +1073,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;
index 9e8ed9c31470795f2b68aa628636328afcb484c0..26fc2139390fe33f9899c41cc54fcd0bcac4f2f4 100644 (file)
@@ -714,7 +714,7 @@ xfs_dir2_leaf_addname(
                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) ||
                                                        args->total == 0) {
                        xfs_trans_brelse(tp, lbp);
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
                }
                /*
                 * Convert to node form.
@@ -738,7 +738,7 @@ xfs_dir2_leaf_addname(
         */
        if (args->op_flags & XFS_DA_OP_JUSTCHECK) {
                xfs_trans_brelse(tp, lbp);
-               return use_block == -1 ? XFS_ERROR(ENOSPC) : 0;
+               return use_block == -1 ? ENOSPC : 0;
        }
        /*
         * If no allocations are allowed, return now before we've
@@ -746,7 +746,7 @@ xfs_dir2_leaf_addname(
         */
        if (args->total == 0 && use_block == -1) {
                xfs_trans_brelse(tp, lbp);
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
        }
        /*
         * Need to compact the leaf entries, removing stale ones.
@@ -1181,7 +1181,7 @@ xfs_dir2_leaf_lookup(
        error = xfs_dir_cilookup_result(args, dep->name, dep->namelen);
        xfs_trans_brelse(tp, dbp);
        xfs_trans_brelse(tp, lbp);
-       return XFS_ERROR(error);
+       return error;
 }
 
 /*
@@ -1316,7 +1316,7 @@ xfs_dir2_leaf_lookup_int(
        if (dbp)
                xfs_trans_brelse(tp, dbp);
        xfs_trans_brelse(tp, lbp);
-       return XFS_ERROR(ENOENT);
+       return ENOENT;
 }
 
 /*
index dc502c478523001e60452718ca650708bef6011b..74db6768209694e0c44daaec510e09456339aab0 100644 (file)
@@ -389,7 +389,7 @@ xfs_dir2_leafn_add(
         * into other peoples memory
         */
        if (index < 0)
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
 
        /*
         * If there are already the maximum number of leaf entries in
@@ -400,7 +400,7 @@ xfs_dir2_leafn_add(
 
        if (leafhdr.count == dp->d_ops->leaf_max_ents(args->geo)) {
                if (!leafhdr.stale)
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
                compact = leafhdr.stale > 1;
        } else
                compact = 0;
@@ -612,7 +612,7 @@ xfs_dir2_leafn_lookup_for_addname(
                                                        XFS_ERRLEVEL_LOW, mp);
                                if (curfdb != newfdb)
                                        xfs_trans_brelse(tp, curbp);
-                               return XFS_ERROR(EFSCORRUPTED);
+                               return EFSCORRUPTED;
                        }
                        curfdb = newfdb;
                        if (be16_to_cpu(bests[fi]) >= length)
@@ -643,7 +643,7 @@ out:
         * Return the index, that will be the insertion point.
         */
        *indexp = index;
-       return XFS_ERROR(ENOENT);
+       return ENOENT;
 }
 
 /*
@@ -772,7 +772,7 @@ xfs_dir2_leafn_lookup_for_entry(
                        curbp->b_ops = &xfs_dir3_data_buf_ops;
                        xfs_trans_buf_set_type(tp, curbp, XFS_BLFT_DIR_DATA_BUF);
                        if (cmp == XFS_CMP_EXACT)
-                               return XFS_ERROR(EEXIST);
+                               return EEXIST;
                }
        }
        ASSERT(index == leafhdr.count || (args->op_flags & XFS_DA_OP_OKNOENT));
@@ -795,7 +795,7 @@ xfs_dir2_leafn_lookup_for_entry(
                state->extravalid = 0;
        }
        *indexp = index;
-       return XFS_ERROR(ENOENT);
+       return ENOENT;
 }
 
 /*
@@ -1798,7 +1798,7 @@ xfs_dir2_node_addname_int(
                 * Not allowed to allocate, return failure.
                 */
                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) || args->total == 0)
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
 
                /*
                 * Allocate and initialize the new data block.
@@ -1859,7 +1859,7 @@ xfs_dir2_node_addname_int(
                                }
                                XFS_ERROR_REPORT("xfs_dir2_node_addname_int",
                                                 XFS_ERRLEVEL_LOW, mp);
-                               return XFS_ERROR(EFSCORRUPTED);
+                               return EFSCORRUPTED;
                        }
 
                        /*
index b5c5bca25c28e058048ba3c1771b839140e70f52..16ce13885042112e18f3a82d25a21578a3cc2fe0 100644 (file)
@@ -290,7 +290,7 @@ xfs_dir2_sf_addname(
         */
        if (dp->i_d.di_size < offsetof(xfs_dir2_sf_hdr_t, parent)) {
                ASSERT(XFS_FORCED_SHUTDOWN(dp->i_mount));
-               return XFS_ERROR(EIO);
+               return EIO;
        }
        ASSERT(dp->i_df.if_bytes == dp->i_d.di_size);
        ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -328,7 +328,7 @@ xfs_dir2_sf_addname(
                 * Just checking or no space reservation, it doesn't fit.
                 */
                if ((args->op_flags & XFS_DA_OP_JUSTCHECK) || args->total == 0)
-                       return XFS_ERROR(ENOSPC);
+                       return ENOSPC;
                /*
                 * Convert to block form then add the name.
                 */
@@ -721,7 +721,7 @@ xfs_dir2_sf_lookup(
         */
        if (dp->i_d.di_size < offsetof(xfs_dir2_sf_hdr_t, parent)) {
                ASSERT(XFS_FORCED_SHUTDOWN(dp->i_mount));
-               return XFS_ERROR(EIO);
+               return EIO;
        }
        ASSERT(dp->i_df.if_bytes == dp->i_d.di_size);
        ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -734,7 +734,7 @@ xfs_dir2_sf_lookup(
                args->inumber = dp->i_ino;
                args->cmpresult = XFS_CMP_EXACT;
                args->filetype = XFS_DIR3_FT_DIR;
-               return XFS_ERROR(EEXIST);
+               return EEXIST;
        }
        /*
         * Special case for ..
@@ -744,7 +744,7 @@ xfs_dir2_sf_lookup(
                args->inumber = dp->d_ops->sf_get_parent_ino(sfp);
                args->cmpresult = XFS_CMP_EXACT;
                args->filetype = XFS_DIR3_FT_DIR;
-               return XFS_ERROR(EEXIST);
+               return EEXIST;
        }
        /*
         * Loop over all the entries trying to match ours.
@@ -764,7 +764,7 @@ xfs_dir2_sf_lookup(
                        args->inumber = dp->d_ops->sf_get_ino(sfp, sfep);
                        args->filetype = dp->d_ops->sf_get_ftype(sfep);
                        if (cmp == XFS_CMP_EXACT)
-                               return XFS_ERROR(EEXIST);
+                               return EEXIST;
                        ci_sfep = sfep;
                }
        }
@@ -774,10 +774,10 @@ xfs_dir2_sf_lookup(
         * If a case-insensitive match was not found, return ENOENT.
         */
        if (!ci_sfep)
-               return XFS_ERROR(ENOENT);
+               return ENOENT;
        /* otherwise process the CI match as required by the caller */
        error = xfs_dir_cilookup_result(args, ci_sfep->name, ci_sfep->namelen);
-       return XFS_ERROR(error);
+       return error;
 }
 
 /*
@@ -807,7 +807,7 @@ xfs_dir2_sf_removename(
         */
        if (oldsize < offsetof(xfs_dir2_sf_hdr_t, parent)) {
                ASSERT(XFS_FORCED_SHUTDOWN(dp->i_mount));
-               return XFS_ERROR(EIO);
+               return EIO;
        }
        ASSERT(dp->i_df.if_bytes == oldsize);
        ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -830,7 +830,7 @@ xfs_dir2_sf_removename(
         * Didn't find it.
         */
        if (i == sfp->count)
-               return XFS_ERROR(ENOENT);
+               return ENOENT;
        /*
         * Calculate sizes.
         */
@@ -897,7 +897,7 @@ xfs_dir2_sf_replace(
         */
        if (dp->i_d.di_size < offsetof(xfs_dir2_sf_hdr_t, parent)) {
                ASSERT(XFS_FORCED_SHUTDOWN(dp->i_mount));
-               return XFS_ERROR(EIO);
+               return EIO;
        }
        ASSERT(dp->i_df.if_bytes == dp->i_d.di_size);
        ASSERT(dp->i_df.if_u1.if_data != NULL);
@@ -973,7 +973,7 @@ xfs_dir2_sf_replace(
                        if (i8elevated)
                                xfs_dir2_sf_toino4(args);
 #endif
-                       return XFS_ERROR(ENOENT);
+                       return ENOENT;
                }
        }
 #if XFS_BIG_INUMS
index 5c080c92e4302026ea6684efe2a31f42b8d754a0..93dc194d30dc5b3986b0ad20c3abfbda75f74df2 100644 (file)
@@ -356,7 +356,7 @@ xfs_ialloc_ag_alloc(
        newlen = args.mp->m_ialloc_inos;
        if (args.mp->m_maxicount &&
            args.mp->m_sb.sb_icount + newlen > args.mp->m_maxicount)
-               return XFS_ERROR(ENOSPC);
+               return ENOSPC;
        args.minlen = args.maxlen = args.mp->m_ialloc_blks;
        /*
         * First try to allocate inodes contiguous with the last-allocated
@@ -1401,7 +1401,7 @@ out_alloc:
        return xfs_dialloc_ag(tp, agbp, parent, inop);
 out_error:
        xfs_perag_put(pag);
-       return XFS_ERROR(error);
+       return error;
 }
 
 STATIC int
@@ -1658,7 +1658,7 @@ xfs_difree(
                xfs_warn(mp, "%s: agno >= mp->m_sb.sb_agcount (%d >= %d).",
                        __func__, agno, mp->m_sb.sb_agcount);
                ASSERT(0);
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
        agino = XFS_INO_TO_AGINO(mp, inode);
        if (inode != XFS_AGINO_TO_INO(mp, agno, agino))  {
@@ -1666,14 +1666,14 @@ xfs_difree(
                        __func__, (unsigned long long)inode,
                        (unsigned long long)XFS_AGINO_TO_INO(mp, agno, agino));
                ASSERT(0);
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
        agbno = XFS_AGINO_TO_AGBNO(mp, agino);
        if (agbno >= mp->m_sb.sb_agblocks)  {
                xfs_warn(mp, "%s: agbno >= mp->m_sb.sb_agblocks (%d >= %d).",
                        __func__, agbno, mp->m_sb.sb_agblocks);
                ASSERT(0);
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
        /*
         * Get the allocation group header.
@@ -1805,7 +1805,7 @@ xfs_imap(
                 * as they can be invalid without implying corruption.
                 */
                if (flags & XFS_IGET_UNTRUSTED)
-                       return XFS_ERROR(EINVAL);
+                       return EINVAL;
                if (agno >= mp->m_sb.sb_agcount) {
                        xfs_alert(mp,
                                "%s: agno (%d) >= mp->m_sb.sb_agcount (%d)",
@@ -1825,7 +1825,7 @@ xfs_imap(
                }
                xfs_stack_trace();
 #endif /* DEBUG */
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
 
        blks_per_cluster = xfs_icluster_size_fsb(mp);
@@ -1898,7 +1898,7 @@ out_map:
                        __func__, (unsigned long long) imap->im_blkno,
                        (unsigned long long) imap->im_len,
                        XFS_FSB_TO_BB(mp, mp->m_sb.sb_dblocks));
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
        return 0;
 }
index 592ed3ee621709055d4aee37c96e91057ea1cabf..08cf5d82e255114a01637864cfe1343c47e29a77 100644 (file)
@@ -167,7 +167,7 @@ xfs_imap_to_bp(
 
                if (error == EFSCORRUPTED &&
                    (iget_flags & XFS_IGET_UNTRUSTED))
-                       return XFS_ERROR(EINVAL);
+                       return EINVAL;
 
                xfs_warn(mp, "%s: xfs_trans_read_buf() returned error %d.",
                        __func__, error);
@@ -376,7 +376,7 @@ xfs_iread(
                                __func__, ip->i_ino);
 
                XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, dip);
-               error = XFS_ERROR(EFSCORRUPTED);
+               error = EFSCORRUPTED;
                goto out_brelse;
        }
 
index 8543395e013872d26c3e87636c02b724f60cb79e..eaab165958b5a2b39fd8a69e40197bdfd9ad5e7f 100644 (file)
@@ -83,7 +83,7 @@ xfs_iformat_fork(
                                be64_to_cpu(dip->di_nblocks));
                XFS_CORRUPTION_ERROR("xfs_iformat(1)", XFS_ERRLEVEL_LOW,
                                     ip->i_mount, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (unlikely(dip->di_forkoff > ip->i_mount->m_sb.sb_inodesize)) {
@@ -92,7 +92,7 @@ xfs_iformat_fork(
                        dip->di_forkoff);
                XFS_CORRUPTION_ERROR("xfs_iformat(2)", XFS_ERRLEVEL_LOW,
                                     ip->i_mount, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        if (unlikely((ip->i_d.di_flags & XFS_DIFLAG_REALTIME) &&
@@ -102,7 +102,7 @@ xfs_iformat_fork(
                        ip->i_ino);
                XFS_CORRUPTION_ERROR("xfs_iformat(realtime)",
                                     XFS_ERRLEVEL_LOW, ip->i_mount, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        switch (ip->i_d.di_mode & S_IFMT) {
@@ -113,7 +113,7 @@ xfs_iformat_fork(
                if (unlikely(dip->di_format != XFS_DINODE_FMT_DEV)) {
                        XFS_CORRUPTION_ERROR("xfs_iformat(3)", XFS_ERRLEVEL_LOW,
                                              ip->i_mount, dip);
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
                }
                ip->i_d.di_size = 0;
                ip->i_df.if_u2.if_rdev = xfs_dinode_get_rdev(dip);
@@ -134,7 +134,7 @@ xfs_iformat_fork(
                                XFS_CORRUPTION_ERROR("xfs_iformat(4)",
                                                     XFS_ERRLEVEL_LOW,
                                                     ip->i_mount, dip);
-                               return XFS_ERROR(EFSCORRUPTED);
+                               return EFSCORRUPTED;
                        }
 
                        di_size = be64_to_cpu(dip->di_size);
@@ -147,7 +147,7 @@ xfs_iformat_fork(
                                XFS_CORRUPTION_ERROR("xfs_iformat(5)",
                                                     XFS_ERRLEVEL_LOW,
                                                     ip->i_mount, dip);
-                               return XFS_ERROR(EFSCORRUPTED);
+                               return EFSCORRUPTED;
                        }
 
                        size = (int)di_size;
@@ -162,13 +162,13 @@ xfs_iformat_fork(
                default:
                        XFS_ERROR_REPORT("xfs_iformat(6)", XFS_ERRLEVEL_LOW,
                                         ip->i_mount);
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
                }
                break;
 
        default:
                XFS_ERROR_REPORT("xfs_iformat(7)", XFS_ERRLEVEL_LOW, ip->i_mount);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        if (error) {
                return error;
@@ -192,7 +192,7 @@ xfs_iformat_fork(
                        XFS_CORRUPTION_ERROR("xfs_iformat(8)",
                                             XFS_ERRLEVEL_LOW,
                                             ip->i_mount, dip);
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
                }
 
                error = xfs_iformat_local(ip, dip, XFS_ATTR_FORK, size);
@@ -204,7 +204,7 @@ xfs_iformat_fork(
                error = xfs_iformat_btree(ip, dip, XFS_ATTR_FORK);
                break;
        default:
-               error = XFS_ERROR(EFSCORRUPTED);
+               error = EFSCORRUPTED;
                break;
        }
        if (error) {
@@ -247,7 +247,7 @@ xfs_iformat_local(
                        XFS_DFORK_SIZE(dip, ip->i_mount, whichfork));
                XFS_CORRUPTION_ERROR("xfs_iformat_local", XFS_ERRLEVEL_LOW,
                                     ip->i_mount, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        ifp = XFS_IFORK_PTR(ip, whichfork);
        real_size = 0;
@@ -303,7 +303,7 @@ xfs_iformat_extents(
                        (unsigned long long) ip->i_ino, nex);
                XFS_CORRUPTION_ERROR("xfs_iformat_extents(1)", XFS_ERRLEVEL_LOW,
                                     ip->i_mount, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        ifp->if_real_bytes = 0;
@@ -331,7 +331,7 @@ xfs_iformat_extents(
                                        XFS_ERROR_REPORT("xfs_iformat_extents(2)",
                                                         XFS_ERRLEVEL_LOW,
                                                         ip->i_mount);
-                                       return XFS_ERROR(EFSCORRUPTED);
+                                       return EFSCORRUPTED;
                                }
        }
        ifp->if_flags |= XFS_IFEXTENTS;
@@ -380,7 +380,7 @@ xfs_iformat_btree(
                                        (unsigned long long) ip->i_ino);
                XFS_CORRUPTION_ERROR("xfs_iformat_btree", XFS_ERRLEVEL_LOW,
                                         mp, dip);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        ifp->if_broot_bytes = size;
@@ -417,7 +417,7 @@ xfs_iread_extents(
        if (unlikely(XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE)) {
                XFS_ERROR_REPORT("xfs_iread_extents", XFS_ERRLEVEL_LOW,
                                 ip->i_mount);
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
        nextents = XFS_IFORK_NEXTENTS(ip, whichfork);
        ifp = XFS_IFORK_PTR(ip, whichfork);
index 27fa7dd9581b7977a2d1223720ddcfc19d6aafbe..2c8447c674ac6c48400e4aa59abf6bf710e95405 100644 (file)
@@ -165,13 +165,13 @@ xfs_mount_validate_sb(
         */
        if (sbp->sb_magicnum != XFS_SB_MAGIC) {
                xfs_warn(mp, "bad magic number");
-               return XFS_ERROR(EWRONGFS);
+               return EWRONGFS;
        }
 
 
        if (!xfs_sb_good_version(sbp)) {
                xfs_warn(mp, "bad version");
-               return XFS_ERROR(EWRONGFS);
+               return EWRONGFS;
        }
 
        /*
@@ -199,7 +199,7 @@ xfs_mount_validate_sb(
                                xfs_warn(mp,
 "Attempted to mount read-only compatible filesystem read-write.\n"
 "Filesystem can only be safely mounted read only.");
-                               return XFS_ERROR(EINVAL);
+                               return EINVAL;
                        }
                }
                if (xfs_sb_has_incompat_feature(sbp,
@@ -209,7 +209,7 @@ xfs_mount_validate_sb(
 "Filesystem can not be safely mounted by this kernel.",
                                (sbp->sb_features_incompat &
                                                XFS_SB_FEAT_INCOMPAT_UNKNOWN));
-                       return XFS_ERROR(EINVAL);
+                       return EINVAL;
                }
        }
 
@@ -217,13 +217,13 @@ xfs_mount_validate_sb(
                if (sbp->sb_qflags & (XFS_OQUOTA_ENFD | XFS_OQUOTA_CHKD)) {
                        xfs_notice(mp,
                           "Version 5 of Super block has XFS_OQUOTA bits.");
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
                }
        } else if (sbp->sb_qflags & (XFS_PQUOTA_ENFD | XFS_GQUOTA_ENFD |
                                XFS_PQUOTA_CHKD | XFS_GQUOTA_CHKD)) {
                        xfs_notice(mp,
 "Superblock earlier than Version 5 has XFS_[PQ]UOTA_{ENFD|CHKD} bits.");
-                       return XFS_ERROR(EFSCORRUPTED);
+                       return EFSCORRUPTED;
        }
 
        if (unlikely(
@@ -231,7 +231,7 @@ xfs_mount_validate_sb(
                xfs_warn(mp,
                "filesystem is marked as having an external log; "
                "specify logdev on the mount command line.");
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
 
        if (unlikely(
@@ -239,7 +239,7 @@ xfs_mount_validate_sb(
                xfs_warn(mp,
                "filesystem is marked as having an internal log; "
                "do not specify logdev on the mount command line.");
-               return XFS_ERROR(EINVAL);
+               return EINVAL;
        }
 
        /*
@@ -273,7 +273,7 @@ xfs_mount_validate_sb(
            sbp->sb_dblocks < XFS_MIN_DBLOCKS(sbp)                      ||
            sbp->sb_shared_vn != 0)) {
                xfs_notice(mp, "SB sanity check failed");
-               return XFS_ERROR(EFSCORRUPTED);
+               return EFSCORRUPTED;
        }
 
        /*
@@ -288,14 +288,14 @@ xfs_mount_validate_sb(
        default:
                xfs_warn(mp, "inode size of %d bytes not supported",
                                sbp->sb_inodesize);
-               return XFS_ERROR(ENOSYS);
+               return ENOSYS;
        }
 
        if (xfs_sb_validate_fsb_count(sbp, sbp->sb_dblocks) ||
            xfs_sb_validate_fsb_count(sbp, sbp->sb_rblocks)) {
                xfs_warn(mp,
                "file system too large to be mounted on this system.");
-               return XFS_ERROR(EFBIG);
+               return EFBIG;
        }
 
        return 0;