xfs: return is not a function

return is not a function.  "return(EIO);" is silly;
"return (EIO);" moreso.  return is not a function.
Nuke the pointless parens.

Port of kernel commit d99831ff393ff2e28d6110b41f24d9fecf986222
from Eric Sandeen.

Signed-off-by: Dave Chinner <dchinner@redhat.com>

diff --git a/libxfs/cache.c b/libxfs/cache.c
index dc69689f48038612aafe015741f4631adca7745b..7509d950b6122cfa034434ee43930cb7cbd9dc1d 100644 (file)
--- a/libxfs/cache.c
+++ b/libxfs/cache.c
@@ -290,7 +290,7 @@ int
 cache_overflowed(
        struct cache *          cache)
 {
-       return (cache->c_maxcount == cache->c_max);
+       return cache->c_maxcount == cache->c_max;
 }
 
 
@@ -550,7 +550,7 @@ cache_node_purge(
                cache_abort();
        }
 #endif
-       return (count == 0);
+       return count == 0;
 }
 
 /*

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index e2a3e62090342110d5a8ce110589ef59d7c06012..ad0b05b4e82b525755b49ae950be1b64e0eb126e 100644 (file)
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -50,7 +50,7 @@ platform_check_iswritable(char *name, char *block, struct stat64 *s, int fatal)
                exit(1);
        }
        close(fd);
-       return (writable == 0);
+       return writable == 0;
 }
 
 int
@@ -112,7 +112,7 @@ platform_direct_blockdev(void)
 int
 platform_align_blockdev(void)
 {
-       return (sizeof(void *));
+       return sizeof(void *);
 }
 
 int

diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index 25339b1c922a579fdb83e5bb790ad25bc1539cc2..5bb7acb356dffe50eb058e53faeee28f994fc84f 100644 (file)
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -62,7 +62,7 @@ platform_check_ismounted(char *name, char *block, struct stat64 *s, int verbose)
                break;
        }
 
-        return (i < cnt);
+        return i < cnt;
 }
 
 int
@@ -169,7 +169,7 @@ platform_direct_blockdev(void)
 int
 platform_align_blockdev(void)
 {
-       return (sizeof(void *));
+       return sizeof(void *);
 }
 
 int

diff --git a/libxfs/irix.c b/libxfs/irix.c
index 9385b512f3d8855d51ff58a1174ea1cbc901c947..1dcb4f6025922b5918f9c72b3757d8f9ace0ca73 100644 (file)
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -88,7 +88,7 @@ platform_direct_blockdev(void)
 int
 platform_align_blockdev(void)
 {
-       return (sizeof(void *));
+       return sizeof(void *);
 }
 
 int
@@ -108,4 +108,4 @@ platform_physmem(void)
                exit(1);
        }
        return (ri.physmem >> 10) * getpagesize();      /* kilobytes */
-}
\ No newline at end of file
+}

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 13d21b24568ceb3deae2b2d1fe7cf4c20231dfe4..dcd10d87061906478fb224420eb47f0a78728929 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -116,7 +116,7 @@ libxfs_trans_roll(
         */
        error = xfs_trans_commit(trans, 0);
        if (error)
-               return (error);
+               return error;
 
        trans = *tpp;
 

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index b4a900a4bf0b5530bb0b9e97604f56f7182f571a..105276d971ec26db754d4a7f263777be1052140d 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -509,27 +509,27 @@ xfs_attr_shortform_addname(xfs_da_args_t *args)
 
        retval = xfs_attr_shortform_lookup(args);
        if ((args->flags & ATTR_REPLACE) && (retval == ENOATTR)) {
-               return(retval);
+               return retval;
        } else if (retval == EEXIST) {
                if (args->flags & ATTR_CREATE)
-                       return(retval);
+                       return retval;
                retval = xfs_attr_shortform_remove(args);
                ASSERT(retval == 0);
        }
 
        if (args->namelen >= XFS_ATTR_SF_ENTSIZE_MAX ||
            args->valuelen >= XFS_ATTR_SF_ENTSIZE_MAX)
-               return(XFS_ERROR(ENOSPC));
+               return XFS_ERROR(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 XFS_ERROR(ENOSPC);
 
        xfs_attr_shortform_add(args, forkoff);
-       return(0);
+       return 0;
 }
 
 
@@ -616,7 +616,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                        ASSERT(committed);
                        args->trans = NULL;
                        xfs_bmap_cancel(args->flist);
-                       return(error);
+                       return error;
                }
 
                /*
@@ -632,13 +632,13 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                 */
                error = xfs_trans_roll(&args->trans, dp);
                if (error)
-                       return (error);
+                       return error;
 
                /*
                 * Fob the whole rest of the problem off on the Btree code.
                 */
                error = xfs_attr_node_addname(args);
-               return(error);
+               return error;
        }
 
        /*
@@ -647,7 +647,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
         */
        error = xfs_trans_roll(&args->trans, dp);
        if (error)
-               return (error);
+               return error;
 
        /*
         * If there was an out-of-line value, allocate the blocks we
@@ -658,7 +658,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
        if (args->rmtblkno > 0) {
                error = xfs_attr_rmtval_set(args);
                if (error)
-                       return(error);
+                       return error;
        }
 
        /*
@@ -674,7 +674,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                 */
                error = xfs_attr3_leaf_flipflags(args);
                if (error)
-                       return(error);
+                       return error;
 
                /*
                 * Dismantle the "old" attribute/value pair by removing
@@ -688,7 +688,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                if (args->rmtblkno) {
                        error = xfs_attr_rmtval_remove(args);
                        if (error)
-                               return(error);
+                               return error;
                }
 
                /*
@@ -718,7 +718,7 @@ xfs_attr_leaf_addname(xfs_da_args_t *args)
                                ASSERT(committed);
                                args->trans = NULL;
                                xfs_bmap_cancel(args->flist);
-                               return(error);
+                               return error;
                        }
 
                        /*
@@ -1005,7 +1005,7 @@ restart:
        if (args->rmtblkno > 0) {
                error = xfs_attr_rmtval_set(args);
                if (error)
-                       return(error);
+                       return error;
        }
 
        /*
@@ -1035,7 +1035,7 @@ restart:
                if (args->rmtblkno) {
                        error = xfs_attr_rmtval_remove(args);
                        if (error)
-                               return(error);
+                               return error;
                }
 
                /*
@@ -1108,8 +1108,8 @@ out:
        if (state)
                xfs_da_state_free(state);
        if (error)
-               return(error);
-       return(retval);
+               return error;
+       return retval;
 }
 
 /*
@@ -1271,7 +1271,7 @@ xfs_attr_node_removename(xfs_da_args_t *args)
 
 out:
        xfs_da_state_free(state);
-       return(error);
+       return error;
 }
 
 /*
@@ -1319,7 +1319,7 @@ xfs_attr_fillstate(xfs_da_state_t *state)
                }
        }
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -1350,7 +1350,7 @@ xfs_attr_refillstate(xfs_da_state_t *state)
                                                blk->blkno, blk->disk_blkno,
                                                &blk->bp, XFS_ATTR_FORK);
                        if (error)
-                               return(error);
+                               return error;
                } else {
                        blk->bp = NULL;
                }
@@ -1369,13 +1369,13 @@ xfs_attr_refillstate(xfs_da_state_t *state)
                                                blk->blkno, blk->disk_blkno,
                                                &blk->bp, XFS_ATTR_FORK);
                        if (error)
-                               return(error);
+                               return error;
                } else {
                        blk->bp = NULL;
                }
        }
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -1429,5 +1429,5 @@ xfs_attr_node_get(xfs_da_args_t *args)
        }
 
        xfs_da_state_free(state);
-       return(retval);
+       return retval;
 }

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index c630ddd8068c5fa492226b9715288798d76cf249..104f6b16b0ced3b8e2e19679113fd91b77896129 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -521,7 +521,7 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
                break;
        }
        if (i == end)
-               return(XFS_ERROR(ENOATTR));
+               return XFS_ERROR(ENOATTR);
 
        /*
         * Fix up the attribute fork data, covering the hole
@@ -556,7 +556,7 @@ xfs_attr_shortform_remove(xfs_da_args_t *args)
 
        xfs_sbversion_add_attr2(mp, args->trans);
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -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 XFS_ERROR(EEXIST);
        }
-       return(XFS_ERROR(ENOATTR));
+       return XFS_ERROR(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 XFS_ERROR(EEXIST);
                }
                if (args->valuelen < sfe->valuelen) {
                        args->valuelen = sfe->valuelen;
-                       return(XFS_ERROR(ERANGE));
+                       return XFS_ERROR(ERANGE);
                }
                args->valuelen = sfe->valuelen;
                memcpy(args->value, &sfe->nameval[args->namelen],
                                                    args->valuelen);
-               return(XFS_ERROR(EEXIST));
+               return XFS_ERROR(EEXIST);
        }
-       return(XFS_ERROR(ENOATTR));
+       return XFS_ERROR(ENOATTR);
 }
 
 /*
@@ -715,7 +715,7 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args)
 
 out:
        kmem_free(tmpbuffer);
-       return(error);
+       return error;
 }
 
 /*
@@ -743,12 +743,12 @@ xfs_attr_shortform_allfit(
                if (entry->flags & XFS_ATTR_INCOMPLETE)
                        continue;               /* don't copy partial entries */
                if (!(entry->flags & XFS_ATTR_LOCAL))
-                       return(0);
+                       return 0;
                name_loc = xfs_attr3_leaf_name_local(leaf, i);
                if (name_loc->namelen >= XFS_ATTR_SF_ENTSIZE_MAX)
-                       return(0);
+                       return 0;
                if (be16_to_cpu(name_loc->valuelen) >= XFS_ATTR_SF_ENTSIZE_MAX)
-                       return(0);
+                       return 0;
                bytes += sizeof(struct xfs_attr_sf_entry) - 1
                                + name_loc->namelen
                                + be16_to_cpu(name_loc->valuelen);
@@ -991,10 +991,10 @@ xfs_attr3_leaf_split(
        ASSERT(oldblk->magic == XFS_ATTR_LEAF_MAGIC);
        error = xfs_da_grow_inode(state->args, &blkno);
        if (error)
-               return(error);
+               return error;
        error = xfs_attr3_leaf_create(state->args, blkno, &newblk->bp);
        if (error)
-               return(error);
+               return error;
        newblk->blkno = blkno;
        newblk->magic = XFS_ATTR_LEAF_MAGIC;
 
@@ -1005,7 +1005,7 @@ xfs_attr3_leaf_split(
        xfs_attr3_leaf_rebalance(state, oldblk, newblk);
        error = xfs_da3_blk_link(state, oldblk, newblk);
        if (error)
-               return(error);
+               return error;
 
        /*
         * Save info on "old" attribute for "atomic rename" ops, leaf_add()
@@ -1027,7 +1027,7 @@ xfs_attr3_leaf_split(
         */
        oldblk->hashval = xfs_attr_leaf_lasthash(oldblk->bp, NULL);
        newblk->hashval = xfs_attr_leaf_lasthash(newblk->bp, NULL);
-       return(error);
+       return error;
 }
 
 /*
@@ -1666,7 +1666,7 @@ xfs_attr3_leaf_toosmall(
                ichdr.usedbytes;
        if (bytes > (state->args->geo->blksize >> 1)) {
                *action = 0;    /* blk over 50%, don't try to join */
-               return(0);
+               return 0;
        }
 
        /*
@@ -1685,7 +1685,7 @@ xfs_attr3_leaf_toosmall(
                error = xfs_da3_path_shift(state, &state->altpath, forward,
                                                 0, &retval);
                if (error)
-                       return(error);
+                       return error;
                if (retval) {
                        *action = 0;
                } else {
@@ -1714,7 +1714,7 @@ xfs_attr3_leaf_toosmall(
                error = xfs_attr3_leaf_read(state->args->trans, state->args->dp,
                                        blkno, -1, &bp);
                if (error)
-                       return(error);
+                       return error;
 
                xfs_attr3_leaf_hdr_from_disk(&ichdr2, bp->b_addr);
 
@@ -1731,7 +1731,7 @@ xfs_attr3_leaf_toosmall(
        }
        if (i >= 2) {
                *action = 0;
-               return(0);
+               return 0;
        }
 
        /*
@@ -1747,13 +1747,13 @@ xfs_attr3_leaf_toosmall(
                                                 0, &retval);
        }
        if (error)
-               return(error);
+               return error;
        if (retval) {
                *action = 0;
        } else {
                *action = 1;
        }
-       return(0);
+       return 0;
 }
 
 /*
@@ -2455,7 +2455,7 @@ xfs_attr3_leaf_clearflag(
         */
        error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
        if (error)
-               return(error);
+               return error;
 
        leaf = bp->b_addr;
        entry = &xfs_attr3_leaf_entryp(leaf)[args->index];
@@ -2522,7 +2522,7 @@ xfs_attr3_leaf_setflag(
         */
        error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);
        if (error)
-               return(error);
+               return error;
 
        leaf = bp->b_addr;
 #ifdef DEBUG

diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 9e02685fdaa14b27977705e23439fb99ccdc2918..c44298111ac950b6ae8e05f625a84c4d287fc062 100644 (file)
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -427,7 +427,7 @@ xfs_attr_rmtval_set(
                        ASSERT(committed);
                        args->trans = NULL;
                        xfs_bmap_cancel(args->flist);
-                       return(error);
+                       return error;
                }
 
                /*
@@ -448,7 +448,7 @@ xfs_attr_rmtval_set(
                 */
                error = xfs_trans_roll(&args->trans, dp);
                if (error)
-                       return (error);
+                       return error;
        }
 
        /*
@@ -473,7 +473,7 @@ xfs_attr_rmtval_set(
                                       blkcnt, &map, &nmap,
                                       XFS_BMAPI_ATTRFORK);
                if (error)
-                       return(error);
+                       return error;
                ASSERT(nmap == 1);
                ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
                       (map.br_startblock != HOLESTARTBLOCK));
@@ -538,7 +538,7 @@ xfs_attr_rmtval_remove(
                error = xfs_bmapi_read(args->dp, (xfs_fileoff_t)lblkno,
                                       blkcnt, &map, &nmap, XFS_BMAPI_ATTRFORK);
                if (error)
-                       return(error);
+                       return error;
                ASSERT(nmap == 1);
                ASSERT((map.br_startblock != DELAYSTARTBLOCK) &&
                       (map.br_startblock != HOLESTARTBLOCK));
@@ -597,7 +597,7 @@ xfs_attr_rmtval_remove(
                 */
                error = xfs_trans_roll(&args->trans, args->dp);
                if (error)
-                       return (error);
+                       return error;
        }
-       return(0);
+       return 0;
 }

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index 6237e9aa4b8bc0f997bfecbe046a4c76778bdd1e..9127784a51656b6b4ed065f6432ddccaf0a05639 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -292,7 +292,7 @@ xfs_da3_node_create(
 
        error = xfs_da_get_buf(tp, dp, blkno, -1, &bp, whichfork);
        if (error)
-               return(error);
+               return error;
        bp->b_ops = &xfs_da3_node_buf_ops;
        xfs_trans_buf_set_type(tp, bp, XFS_BLFT_DA_NODE_BUF);
        node = bp->b_addr;
@@ -314,7 +314,7 @@ xfs_da3_node_create(
                XFS_DA_LOGRANGE(node, &node->hdr, dp->d_ops->node_hdr_size));
 
        *bpp = bp;
-       return(0);
+       return 0;
 }
 
 /*
@@ -363,7 +363,7 @@ xfs_da3_split(
                case XFS_ATTR_LEAF_MAGIC:
                        error = xfs_attr3_leaf_split(state, oldblk, newblk);
                        if ((error != 0) && (error != ENOSPC)) {
-                               return(error);  /* GROT: attr is inconsistent */
+                               return error;   /* GROT: attr is inconsistent */
                        }
                        if (!error) {
                                addblk = newblk;
@@ -385,7 +385,7 @@ xfs_da3_split(
                                                            &state->extrablk);
                        }
                        if (error)
-                               return(error);  /* GROT: attr inconsistent */
+                               return error;   /* GROT: attr inconsistent */
                        addblk = newblk;
                        break;
                case XFS_DIR2_LEAFN_MAGIC:
@@ -399,7 +399,7 @@ xfs_da3_split(
                                                         max - i, &action);
                        addblk->bp = NULL;
                        if (error)
-                               return(error);  /* GROT: dir is inconsistent */
+                               return error;   /* GROT: dir is inconsistent */
                        /*
                         * Record the newly split block for the next time thru?
                         */
@@ -416,7 +416,7 @@ xfs_da3_split(
                xfs_da3_fixhashpath(state, &state->path);
        }
        if (!addblk)
-               return(0);
+               return 0;
 
        /*
         * Split the root node.
@@ -426,7 +426,7 @@ xfs_da3_split(
        error = xfs_da3_root_split(state, oldblk, addblk);
        if (error) {
                addblk->bp = NULL;
-               return(error);  /* GROT: dir is inconsistent */
+               return error;   /* GROT: dir is inconsistent */
        }
 
        /*
@@ -469,7 +469,7 @@ xfs_da3_split(
                    sizeof(node->hdr.info)));
        }
        addblk->bp = NULL;
-       return(0);
+       return 0;
 }
 
 /*
@@ -647,18 +647,18 @@ xfs_da3_node_split(
                 */
                error = xfs_da_grow_inode(state->args, &blkno);
                if (error)
-                       return(error);  /* GROT: dir is inconsistent */
+                       return error;   /* GROT: dir is inconsistent */
 
                error = xfs_da3_node_create(state->args, blkno, treelevel,
                                           &newblk->bp, state->args->whichfork);
                if (error)
-                       return(error);  /* GROT: dir is inconsistent */
+                       return error;   /* GROT: dir is inconsistent */
                newblk->blkno = blkno;
                newblk->magic = XFS_DA_NODE_MAGIC;
                xfs_da3_node_rebalance(state, oldblk, newblk);
                error = xfs_da3_blk_link(state, oldblk, newblk);
                if (error)
-                       return(error);
+                       return error;
                *result = 1;
        } else {
                *result = 0;
@@ -698,7 +698,7 @@ xfs_da3_node_split(
                }
        }
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -940,9 +940,9 @@ xfs_da3_join(
                case XFS_ATTR_LEAF_MAGIC:
                        error = xfs_attr3_leaf_toosmall(state, &action);
                        if (error)
-                               return(error);
+                               return error;
                        if (action == 0)
-                               return(0);
+                               return 0;
                        xfs_attr3_leaf_unbalance(state, drop_blk, save_blk);
                        break;
                case XFS_DIR2_LEAFN_MAGIC:
@@ -962,7 +962,7 @@ xfs_da3_join(
                        xfs_da3_fixhashpath(state, &state->path);
                        error = xfs_da3_node_toosmall(state, &action);
                        if (error)
-                               return(error);
+                               return error;
                        if (action == 0)
                                return 0;
                        xfs_da3_node_unbalance(state, drop_blk, save_blk);
@@ -972,12 +972,12 @@ xfs_da3_join(
                error = xfs_da3_blk_unlink(state, drop_blk, save_blk);
                xfs_da_state_kill_altpath(state);
                if (error)
-                       return(error);
+                       return error;
                error = xfs_da_shrink_inode(state->args, drop_blk->blkno,
                                                         drop_blk->bp);
                drop_blk->bp = NULL;
                if (error)
-                       return(error);
+                       return error;
        }
        /*
         * We joined all the way to the top.  If it turns out that
@@ -987,7 +987,7 @@ xfs_da3_join(
        xfs_da3_node_remove(state, drop_blk);
        xfs_da3_fixhashpath(state, &state->path);
        error = xfs_da3_root_join(state, &state->path.blk[0]);
-       return(error);
+       return error;
 }
 
 #ifdef DEBUG
@@ -1076,7 +1076,7 @@ xfs_da3_root_join(
        xfs_trans_log_buf(args->trans, root_blk->bp, 0,
                          args->geo->blksize - 1);
        error = xfs_da_shrink_inode(args, child, bp);
-       return(error);
+       return error;
 }
 
 /*
@@ -1119,7 +1119,7 @@ xfs_da3_node_toosmall(
        dp->d_ops->node_hdr_from_disk(&nodehdr, node);
        if (nodehdr.count > (state->args->geo->node_ents >> 1)) {
                *action = 0;    /* blk over 50%, don't try to join */
-               return(0);      /* blk over 50%, don't try to join */
+               return 0;       /* blk over 50%, don't try to join */
        }
 
        /*
@@ -1138,13 +1138,13 @@ xfs_da3_node_toosmall(
                error = xfs_da3_path_shift(state, &state->altpath, forward,
                                                 0, &retval);
                if (error)
-                       return(error);
+                       return error;
                if (retval) {
                        *action = 0;
                } else {
                        *action = 2;
                }
-               return(0);
+               return 0;
        }
 
        /*
@@ -1171,7 +1171,7 @@ xfs_da3_node_toosmall(
                error = xfs_da3_node_read(state->args->trans, dp,
                                        blkno, -1, &bp, state->args->whichfork);
                if (error)
-                       return(error);
+                       return error;
 
                node = bp->b_addr;
                dp->d_ops->node_hdr_from_disk(&thdr, node);
@@ -1463,7 +1463,7 @@ xfs_da3_node_lookup_int(
                if (error) {
                        blk->blkno = 0;
                        state->path.active--;
-                       return(error);
+                       return error;
                }
                curr = blk->bp->b_addr;
                blk->magic = be16_to_cpu(curr->magic);
@@ -1563,7 +1563,7 @@ xfs_da3_node_lookup_int(
                        error = xfs_da3_path_shift(state, &state->path, 1, 1,
                                                         &retval);
                        if (error)
-                               return(error);
+                               return error;
                        if (retval == 0) {
                                continue;
                        } else if (blk->magic == XFS_ATTR_LEAF_MAGIC) {
@@ -1574,7 +1574,7 @@ xfs_da3_node_lookup_int(
                break;
        }
        *result = retval;
-       return(0);
+       return 0;
 }
 
 /*========================================================================
@@ -1669,7 +1669,7 @@ xfs_da3_blk_link(
                                                be32_to_cpu(old_info->back),
                                                -1, &bp, args->whichfork);
                        if (error)
-                               return(error);
+                               return error;
                        ASSERT(bp != NULL);
                        tmp_info = bp->b_addr;
                        ASSERT(tmp_info->magic == old_info->magic);
@@ -1690,7 +1690,7 @@ xfs_da3_blk_link(
                                                be32_to_cpu(old_info->forw),
                                                -1, &bp, args->whichfork);
                        if (error)
-                               return(error);
+                               return error;
                        ASSERT(bp != NULL);
                        tmp_info = bp->b_addr;
                        ASSERT(tmp_info->magic == old_info->magic);
@@ -1703,7 +1703,7 @@ xfs_da3_blk_link(
 
        xfs_trans_log_buf(args->trans, old_blk->bp, 0, sizeof(*tmp_info) - 1);
        xfs_trans_log_buf(args->trans, new_blk->bp, 0, sizeof(*tmp_info) - 1);
-       return(0);
+       return 0;
 }
 
 /*
@@ -1749,7 +1749,7 @@ xfs_da3_blk_unlink(
                                                be32_to_cpu(drop_info->back),
                                                -1, &bp, args->whichfork);
                        if (error)
-                               return(error);
+                               return error;
                        ASSERT(bp != NULL);
                        tmp_info = bp->b_addr;
                        ASSERT(tmp_info->magic == save_info->magic);
@@ -1766,7 +1766,7 @@ xfs_da3_blk_unlink(
                                                be32_to_cpu(drop_info->forw),
                                                -1, &bp, args->whichfork);
                        if (error)
-                               return(error);
+                               return error;
                        ASSERT(bp != NULL);
                        tmp_info = bp->b_addr;
                        ASSERT(tmp_info->magic == save_info->magic);
@@ -1778,7 +1778,7 @@ xfs_da3_blk_unlink(
        }
 
        xfs_trans_log_buf(args->trans, save_blk->bp, 0, sizeof(*save_info) - 1);
-       return(0);
+       return 0;
 }
 
 /*
@@ -1838,7 +1838,7 @@ xfs_da3_path_shift(
        if (level < 0) {
                *result = XFS_ERROR(ENOENT);    /* we're out of our tree */
                ASSERT(args->op_flags & XFS_DA_OP_OKNOENT);
-               return(0);
+               return 0;
        }
 
        /*
@@ -1860,7 +1860,7 @@ xfs_da3_path_shift(
                error = xfs_da3_node_read(args->trans, dp, blkno, -1,
                                        &blk->bp, args->whichfork);
                if (error)
-                       return(error);
+                       return error;
                info = blk->bp->b_addr;
                ASSERT(info->magic == cpu_to_be16(XFS_DA_NODE_MAGIC) ||
                       info->magic == cpu_to_be16(XFS_DA3_NODE_MAGIC) ||

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index bc6826a136d746d43735f32cf40924147cfc4978..8543395e013872d26c3e87636c02b724f60cb79e 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -1673,7 +1673,7 @@ xfs_iext_idx_to_irec(
        }
        *idxp = page_idx;
        *erp_idxp = erp_idx;
-       return(erp);
+       return erp;
 }
 
 /*