return statement cleanup - kill pointless parentheses

This patch removes pointless parentheses from return statements.

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

7 files changed, 206 insertions, 207 deletions

diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c
index 7dcdd0640c32..8d5886020107 100644
--- a/fs/xfs/quota/xfs_qm.c
+++ b/fs/xfs/quota/xfs_qm.c
@@ -497,7 +497,7 @@ xfs_qm_dqflush_all(
         int             error;
 
         if (mp->m_quotainfo == NULL)
-                return (0);
+                return 0;
         niters = 0;
 again:
         xfs_qm_mplist_lock(mp);
@@ -528,7 +528,7 @@ again:
                 error = xfs_qm_dqflush(dqp, flags);
                 xfs_dqunlock(dqp);
                 if (error)
-                        return (error);
+                        return error;
 
                 xfs_qm_mplist_lock(mp);
                 if (recl != XFS_QI_MPLRECLAIMS(mp)) {
@@ -540,7 +540,7 @@ again:
 
         xfs_qm_mplist_unlock(mp);
         /* return ! busy */
-        return (0);
+        return 0;
 }
 /*
  * Release the group dquot pointers the user dquots may be
@@ -599,7 +599,7 @@ xfs_qm_dqpurge_int(
         int             nmisses;
 
         if (mp->m_quotainfo == NULL)
-                return (0);
+                return 0;
 
         dqtype = (flags & XFS_QMOPT_UQUOTA) ? XFS_DQ_USER : 0;
         dqtype |= (flags & XFS_QMOPT_PQUOTA) ? XFS_DQ_PROJ : 0;
@@ -796,7 +796,7 @@ xfs_qm_dqattach_one(
                         ASSERT(XFS_DQ_IS_LOCKED(dqp));
         }
 #endif
-        return (error);
+        return error;
 }
 
 
@@ -897,7 +897,7 @@ xfs_qm_dqattach(
             (! XFS_NOT_DQATTACHED(mp, ip)) ||
             (ip->i_ino == mp->m_sb.sb_uquotino) ||
             (ip->i_ino == mp->m_sb.sb_gquotino))
-                return (0);
+                return 0;
 
         ASSERT((flags & XFS_QMOPT_ILOCKED) == 0 ||
                XFS_ISLOCKED_INODE_EXCL(ip));
@@ -984,7 +984,7 @@ xfs_qm_dqattach(
         else
                 ASSERT(XFS_ISLOCKED_INODE_EXCL(ip));
 #endif
-        return (error);
+        return error;
 }
 
 /*
@@ -1049,7 +1049,7 @@ xfs_qm_sync(
          */
         if (! XFS_IS_QUOTA_ON(mp)) {
                 xfs_qm_mplist_unlock(mp);
-                return (0);
+                return 0;
         }
         FOREACH_DQUOT_IN_MP(dqp, mp) {
                 /*
@@ -1109,9 +1109,9 @@ xfs_qm_sync(
                 error = xfs_qm_dqflush(dqp, flush_flags);
                 xfs_dqunlock(dqp);
                 if (error && XFS_FORCED_SHUTDOWN(mp))
-                        return(0);      /* Need to prevent umount failure */
+                        return 0;       /* Need to prevent umount failure */
                 else if (error)
-                        return (error);
+                        return error;
 
                 xfs_qm_mplist_lock(mp);
                 if (recl != XFS_QI_MPLRECLAIMS(mp)) {
@@ -1124,7 +1124,7 @@ xfs_qm_sync(
         }
 
         xfs_qm_mplist_unlock(mp);
-        return (0);
+        return 0;
 }
 
 
@@ -1146,7 +1146,7 @@ xfs_qm_init_quotainfo(
          * Tell XQM that we exist as soon as possible.
          */
         if ((error = xfs_qm_hold_quotafs_ref(mp))) {
-                return (error);
+                return error;
         }
 
         qinf = mp->m_quotainfo = kmem_zalloc(sizeof(xfs_quotainfo_t), KM_SLEEP);
@@ -1158,7 +1158,7 @@ xfs_qm_init_quotainfo(
         if ((error = xfs_qm_init_quotainos(mp))) {
                 kmem_free(qinf, sizeof(xfs_quotainfo_t));
                 mp->m_quotainfo = NULL;
-                return (error);
+                return error;
         }
 
         spinlock_init(&qinf->qi_pinlock, "xfs_qinf_pin");
@@ -1232,7 +1232,7 @@ xfs_qm_init_quotainfo(
                 qinf->qi_rtbwarnlimit = XFS_QM_RTBWARNLIMIT;
         }
 
-        return (0);
+        return 0;
 }
 
 
@@ -1332,7 +1332,7 @@ xfs_qm_dqget_noattach(
                          */
                         ASSERT(error != ESRCH);
                         ASSERT(error != ENOENT);
-                        return (error);
+                        return error;
                 }
                 ASSERT(udqp);
         }
@@ -1355,7 +1355,7 @@ xfs_qm_dqget_noattach(
                                 xfs_qm_dqrele(udqp);
                         ASSERT(error != ESRCH);
                         ASSERT(error != ENOENT);
-                        return (error);
+                        return error;
                 }
                 ASSERT(gdqp);
 
@@ -1376,7 +1376,7 @@ xfs_qm_dqget_noattach(
         if (udqp) ASSERT(XFS_DQ_IS_LOCKED(udqp));
         if (gdqp) ASSERT(XFS_DQ_IS_LOCKED(gdqp));
 #endif
-        return (0);
+        return 0;
 }
 
 /*
@@ -1404,7 +1404,7 @@ xfs_qm_qino_alloc(
                                       XFS_TRANS_PERM_LOG_RES,
                                       XFS_CREATE_LOG_COUNT))) {
                 xfs_trans_cancel(tp, 0);
-                return (error);
+                return error;
         }
         memset(&zerocr, 0, sizeof(zerocr));
         memset(&zeroino, 0, sizeof(zeroino));
@@ -1413,7 +1413,7 @@ xfs_qm_qino_alloc(
                                    &zerocr, 0, 1, ip, &committed))) {
                 xfs_trans_cancel(tp, XFS_TRANS_RELEASE_LOG_RES |
                                  XFS_TRANS_ABORT);
-                return (error);
+                return error;
         }
 
         /*
@@ -1461,9 +1461,9 @@ xfs_qm_qino_alloc(
         if ((error = xfs_trans_commit(tp, XFS_TRANS_RELEASE_LOG_RES,
                                      NULL))) {
                 xfs_fs_cmn_err(CE_ALERT, mp, "XFS qino_alloc failed!");
-                return (error);
+                return error;
         }
-        return (0);
+        return 0;
 }
 
 
@@ -1508,7 +1508,7 @@ xfs_qm_reset_dqcounts(
                 ddq = (xfs_disk_dquot_t *) ((xfs_dqblk_t *)ddq + 1);
         }
 
-        return (0);
+        return 0;
 }
 
 STATIC int
@@ -1557,7 +1557,7 @@ xfs_qm_dqiter_bufs(
                 bno++;
                 firstid += XFS_QM_DQPERBLK(mp);
         }
-        return (error);
+        return error;
 }
 
 /*
@@ -1586,7 +1586,7 @@ xfs_qm_dqiterate(
          * happens only at mount time which is single threaded.
          */
         if (qip->i_d.di_nblocks == 0)
-                return (0);
+                return 0;
 
         map = kmem_alloc(XFS_DQITER_MAP_SIZE * sizeof(*map), KM_SLEEP);
 
@@ -1655,7 +1655,7 @@ xfs_qm_dqiterate(
 
         kmem_free(map, XFS_DQITER_MAP_SIZE * sizeof(*map));
 
-        return (error);
+        return error;
 }
 
 /*
@@ -1715,7 +1715,7 @@ xfs_qm_get_rtblks(
         ifp = XFS_IFORK_PTR(ip, XFS_DATA_FORK);
         if (!(ifp->if_flags & XFS_IFEXTENTS)) {
                 if ((error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK)))
-                        return (error);
+                        return error;
         }
         rtblks = 0;
         nextents = ifp->if_bytes / sizeof(xfs_bmbt_rec_t);
@@ -1723,7 +1723,7 @@ xfs_qm_get_rtblks(
         for (ep = base; ep < &base[nextents]; ep++)
                 rtblks += xfs_bmbt_get_blockcount(ep);
         *O_rtblks = (xfs_qcnt_t)rtblks;
-        return (0);
+        return 0;
 }
 
 /*
@@ -1767,7 +1767,7 @@ xfs_qm_dqusage_adjust(
          */
         if ((error = xfs_iget(mp, NULL, ino, 0, XFS_ILOCK_EXCL, &ip, bno))) {
                 *res = BULKSTAT_RV_NOTHING;
-                return (error);
+                return error;
         }
 
         if (ip->i_d.di_mode == 0) {
@@ -1785,7 +1785,7 @@ xfs_qm_dqusage_adjust(
         if ((error = xfs_qm_dqget_noattach(ip, &udqp, &gdqp))) {
                 xfs_iput(ip, XFS_ILOCK_EXCL);
                 *res = BULKSTAT_RV_GIVEUP;
-                return (error);
+                return error;
         }
 
         rtblks = 0;
@@ -1802,7 +1802,7 @@ xfs_qm_dqusage_adjust(
                         if (gdqp)
                                 xfs_qm_dqput(gdqp);
                         *res = BULKSTAT_RV_GIVEUP;
-                        return (error);
+                        return error;
                 }
                 nblks = (xfs_qcnt_t)ip->i_d.di_nblocks - rtblks;
         }
@@ -1847,7 +1847,7 @@ xfs_qm_dqusage_adjust(
          * Goto next inode.
          */
         *res = BULKSTAT_RV_DIDONE;
-        return (0);
+        return 0;
 }
 
 /*
@@ -2041,7 +2041,7 @@ xfs_qm_init_quotainos(
         XFS_QI_UQIP(mp) = uip;
         XFS_QI_GQIP(mp) = gip;
 
-        return (0);
+        return 0;
 }
 
 
@@ -2062,7 +2062,7 @@ xfs_qm_shake_freelist(
         int             nflushes;
 
         if (howmany <= 0)
-                return (0);
+                return 0;
 
         nreclaimed = 0;
         restarts = 0;
@@ -2088,7 +2088,7 @@ xfs_qm_shake_freelist(
                         xfs_dqunlock(dqp);
                         xfs_qm_freelist_unlock(xfs_Gqm);
                         if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
-                                return (nreclaimed);
+                                return nreclaimed;
                         XQM_STATS_INC(xqmstats.xs_qm_dqwants);
                         goto tryagain;
                 }
@@ -2163,7 +2163,7 @@ xfs_qm_shake_freelist(
                         XFS_DQ_HASH_UNLOCK(hash);
                         xfs_qm_freelist_unlock(xfs_Gqm);
                         if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
-                                return (nreclaimed);
+                                return nreclaimed;
                         goto tryagain;
                 }
                 xfs_dqtrace_entry(dqp, "DQSHAKE: UNLINKING");
@@ -2188,7 +2188,7 @@ xfs_qm_shake_freelist(
                 dqp = nextdqp;
         }
         xfs_qm_freelist_unlock(xfs_Gqm);
-        return (nreclaimed);
+        return nreclaimed;
 }
 
 
@@ -2202,9 +2202,9 @@ xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask)
         int     ndqused, nfree, n;
 
         if (!kmem_shake_allow(gfp_mask))
-                return (0);
+                return 0;
         if (!xfs_Gqm)
-                return (0);
+                return 0;
 
         nfree = xfs_Gqm->qm_dqfreelist.qh_nelems; /* free dquots */
         /* incore dquots in all f/s's */
@@ -2213,7 +2213,7 @@ xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask)
         ASSERT(ndqused >= 0);
 
         if (nfree <= ndqused && nfree < ndquot)
-                return (0);
+                return 0;
 
         ndqused *= xfs_Gqm->qm_dqfree_ratio;    /* target # of free dquots */
         n = nfree - ndqused - ndquot;           /* # over target */
@@ -2257,7 +2257,7 @@ xfs_qm_dqreclaim_one(void)
                         xfs_dqunlock(dqp);
                         xfs_qm_freelist_unlock(xfs_Gqm);
                         if (++restarts >= XFS_QM_RECLAIM_MAX_RESTARTS)
-                                return (NULL);
+                                return NULL;
                         XQM_STATS_INC(xqmstats.xs_qm_dqwants);
                         goto startagain;
                 }
@@ -2333,7 +2333,7 @@ xfs_qm_dqreclaim_one(void)
         }
 
         xfs_qm_freelist_unlock(xfs_Gqm);
-        return (dqpout);
+        return dqpout;
 }
 
 
@@ -2369,7 +2369,7 @@ xfs_qm_dqalloc_incore(
                          */
                         memset(&dqp->q_core, 0, sizeof(dqp->q_core));
                         *O_dqpp = dqp;
-                        return (B_FALSE);
+                        return B_FALSE;
                 }
                 XQM_STATS_INC(xqmstats.xs_qm_dqreclaim_misses);
         }
@@ -2382,7 +2382,7 @@ xfs_qm_dqalloc_incore(
         *O_dqpp = kmem_zone_zalloc(xfs_Gqm->qm_dqzone, KM_SLEEP);
         atomic_inc(&xfs_Gqm->qm_totaldquots);
 
-        return (B_TRUE);
+        return B_TRUE;
 }
 
 
@@ -2407,13 +2407,13 @@ xfs_qm_write_sb_changes(
                                       0,
                                       XFS_DEFAULT_LOG_COUNT))) {
                 xfs_trans_cancel(tp, 0);
-                return (error);
+                return error;
         }
 
         xfs_mod_sb(tp, flags);
         (void) xfs_trans_commit(tp, 0, NULL);
 
-        return (0);
+        return 0;
 }
 
 
@@ -2463,7 +2463,7 @@ xfs_qm_vop_dqalloc(
                 if ((error = xfs_qm_dqattach(ip, XFS_QMOPT_DQALLOC |
                                             XFS_QMOPT_ILOCKED))) {
                         xfs_iunlock(ip, lockflags);
-                        return (error);
+                        return error;
                 }
         }
 
@@ -2486,7 +2486,7 @@ xfs_qm_vop_dqalloc(
                                                  XFS_QMOPT_DOWARN,
                                                  &uq))) {
                                 ASSERT(error != ENOENT);
-                                return (error);
+                                return error;
                         }
                         /*
                          * Get the ilock in the right order.
@@ -2517,7 +2517,7 @@ xfs_qm_vop_dqalloc(
                                 if (uq)
                                         xfs_qm_dqrele(uq);
                                 ASSERT(error != ENOENT);
-                                return (error);
+                                return error;
                         }
                         xfs_dqunlock(gq);
                         lockflags = XFS_ILOCK_SHARED;
@@ -2565,7 +2565,7 @@ xfs_qm_vop_dqalloc(
                 *O_gdqpp = gq;
         else if (gq)
                 xfs_qm_dqrele(gq);
-        return (0);
+        return 0;
 }
 
 /*
@@ -2608,7 +2608,7 @@ xfs_qm_vop_chown(
         xfs_dqunlock(newdq);
         *IO_olddq = newdq;
 
-        return (prevdq);
+        return prevdq;
 }
 
 /*
@@ -2702,12 +2702,12 @@ xfs_qm_vop_rename_dqattach(
         ip = i_tab[0];
 
         if (! XFS_IS_QUOTA_ON(ip->i_mount))
-                return (0);
+                return 0;
 
         if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) {
                 error = xfs_qm_dqattach(ip, 0);
                 if (error)
-                        return (error);
+                        return error;
         }
         for (i = 1; (i < 4 && i_tab[i]); i++) {
                 /*
@@ -2717,11 +2717,11 @@ xfs_qm_vop_rename_dqattach(
                         if (XFS_NOT_DQATTACHED(ip->i_mount, ip)) {
                                 error = xfs_qm_dqattach(ip, 0);
                                 if (error)
-                                        return (error);
+                                        return error;
                         }
                 }
         }
-        return (0);
+        return 0;
 }
 
 void
@@ -2834,7 +2834,7 @@ xfs_qm_dqhashlock_nowait(
         int locked;
 
         locked = mutex_trylock(&((dqp)->q_hash->qh_lock));
-        return (locked);
+        return locked;
 }
 
 int
@@ -2844,7 +2844,7 @@ xfs_qm_freelist_lock_nowait(
         int locked;
 
         locked = mutex_trylock(&(xqm->qm_dqfreelist.qh_lock));
-        return (locked);
+        return locked;
 }
 
 STATIC int
@@ -2855,5 +2855,5 @@ xfs_qm_mplist_nowait(
 
         ASSERT(mp->m_quotainfo);
         locked = mutex_trylock(&(XFS_QI_MPLLOCK(mp)));
-        return (locked);
+        return locked;
 }
diff --git a/fs/xfs/xfs_dir_leaf.c b/fs/xfs/xfs_dir_leaf.c
index 950df31efc46..e83074016abb 100644
--- a/fs/xfs/xfs_dir_leaf.c
+++ b/fs/xfs/xfs_dir_leaf.c
@@ -147,7 +147,7 @@ xfs_dir_shortform_create(xfs_da_args_t *args, xfs_ino_t parent)
         hdr->count = 0;
         dp->i_d.di_size = sizeof(*hdr);
         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
-        return(0);
+        return 0;
 }
 
 /*
@@ -180,7 +180,7 @@ xfs_dir_shortform_addname(xfs_da_args_t *args)
                 if (sfe->namelen == args->namelen &&
                     args->name[0] == sfe->name[0] &&
                     memcmp(args->name, sfe->name, args->namelen) == 0)
-                        return(XFS_ERROR(EEXIST));
+                        return XFS_ERROR(EEXIST);
                 sfe = XFS_DIR_SF_NEXTENTRY(sfe);
         }
 
@@ -198,7 +198,7 @@ xfs_dir_shortform_addname(xfs_da_args_t *args)
         dp->i_d.di_size += size;
         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 
-        return(0);
+        return 0;
 }
 
 /*
@@ -238,7 +238,7 @@ xfs_dir_shortform_removename(xfs_da_args_t *args)
         }
         if (i < 0) {
                 ASSERT(args->oknoent);
-                return(XFS_ERROR(ENOENT));
+                return XFS_ERROR(ENOENT);
         }
 
         if ((base + size) != dp->i_d.di_size) {
@@ -251,7 +251,7 @@ xfs_dir_shortform_removename(xfs_da_args_t *args)
         dp->i_d.di_size -= size;
         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_CORE | XFS_ILOG_DDATA);
 
-        return(0);
+        return 0;
 }
 
 /*
@@ -390,7 +390,7 @@ xfs_dir_shortform_to_leaf(xfs_da_args_t *iargs)
 
 out:
         kmem_free(tmpbuffer, size);
-        return(retval);
+        return retval;
 }
 
 STATIC int
@@ -596,7 +596,7 @@ xfs_dir_shortform_replace(xfs_da_args_t *args)
                 /* XXX - replace assert? */
                 XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sf->hdr.parent);
                 xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA);
-                return(0);
+                return 0;
         }
         ASSERT(args->namelen != 1 || args->name[0] != '.');
         sfe = &sf->list[0];
@@ -608,12 +608,12 @@ xfs_dir_shortform_replace(xfs_da_args_t *args)
                                 (char *)&sfe->inumber, sizeof(xfs_ino_t)));
                         XFS_DIR_SF_PUT_DIRINO(&args->inumber, &sfe->inumber);
                         xfs_trans_log_inode(args->trans, dp, XFS_ILOG_DDATA);
-                        return(0);
+                        return 0;
                 }
                 sfe = XFS_DIR_SF_NEXTENTRY(sfe);
         }
         ASSERT(args->oknoent);
-        return(XFS_ERROR(ENOENT));
+        return XFS_ERROR(ENOENT);
 }
 
 /*
@@ -695,7 +695,7 @@ xfs_dir_leaf_to_shortform(xfs_da_args_t *iargs)
 
 out:
         kmem_free(tmpbuffer, XFS_LBSIZE(dp->i_mount));
-        return(retval);
+        return retval;
 }
 
 /*
@@ -715,17 +715,17 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args)
         retval = xfs_da_grow_inode(args, &blkno);
         ASSERT(blkno == 1);
         if (retval)
-                return(retval);
+                return retval;
         retval = xfs_da_read_buf(args->trans, args->dp, 0, -1, &bp1,
                                               XFS_DATA_FORK);
         if (retval)
-                return(retval);
+                return retval;
         ASSERT(bp1 != NULL);
         retval = xfs_da_get_buf(args->trans, args->dp, 1, -1, &bp2,
                                              XFS_DATA_FORK);
         if (retval) {
                 xfs_da_buf_done(bp1);
-                return(retval);
+                return retval;
         }
         ASSERT(bp2 != NULL);
         memcpy(bp2->data, bp1->data, XFS_LBSIZE(dp->i_mount));
@@ -738,7 +738,7 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args)
         retval = xfs_da_node_create(args, 0, 1, &bp1, XFS_DATA_FORK);
         if (retval) {
                 xfs_da_buf_done(bp2);
-                return(retval);
+                return retval;
         }
         node = bp1->data;
         leaf = bp2->data;
@@ -751,7 +751,7 @@ xfs_dir_leaf_to_node(xfs_da_args_t *args)
                 XFS_DA_LOGRANGE(node, &node->btree[0], sizeof(node->btree[0])));
         xfs_da_buf_done(bp1);
 
-        return(retval);
+        return retval;
 }
 
 
@@ -776,7 +776,7 @@ xfs_dir_leaf_create(xfs_da_args_t *args, xfs_dablk_t blkno, xfs_dabuf_t **bpp)
         ASSERT(dp != NULL);
         retval = xfs_da_get_buf(args->trans, dp, blkno, -1, &bp, XFS_DATA_FORK);
         if (retval)
-                return(retval);
+                return retval;
         ASSERT(bp != NULL);
         leaf = bp->data;
         memset((char *)leaf, 0, XFS_LBSIZE(dp->i_mount));
@@ -791,7 +791,7 @@ xfs_dir_leaf_create(xfs_da_args_t *args, xfs_dablk_t blkno, xfs_dabuf_t **bpp)
         xfs_da_log_buf(args->trans, bp, 0, XFS_LBSIZE(dp->i_mount) - 1);
 
         *bpp = bp;
-        return(0);
+        return 0;
 }
 
 /*
@@ -813,10 +813,10 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk,
         ASSERT(oldblk->magic == XFS_DIR_LEAF_MAGIC);
         error = xfs_da_grow_inode(args, &blkno);
         if (error)
-                return(error);
+                return error;
         error = xfs_dir_leaf_create(args, blkno, &newblk->bp);
         if (error)
-                return(error);
+                return error;
         newblk->blkno = blkno;
         newblk->magic = XFS_DIR_LEAF_MAGIC;
 
@@ -826,7 +826,7 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk,
         xfs_dir_leaf_rebalance(state, oldblk, newblk);
         error = xfs_da_blk_link(state, oldblk, newblk);
         if (error)
-                return(error);
+                return error;
 
         /*
          * Insert the new entry in the correct block.
@@ -842,7 +842,7 @@ xfs_dir_leaf_split(xfs_da_state_t *state, xfs_da_state_blk_t *oldblk,
          */
         oldblk->hashval = xfs_dir_leaf_lasthash(oldblk->bp, NULL);
         newblk->hashval = xfs_dir_leaf_lasthash(newblk->bp, NULL);
-        return(error);
+        return error;
 }
 
 /*
@@ -885,7 +885,7 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index)
                 if (INT_GET(map->size, ARCH_CONVERT) >= tmp) {
                         if (!args->justcheck)
                                 xfs_dir_leaf_add_work(bp, args, index, i);
-                        return(0);
+                        return 0;
                 }
                 sum += INT_GET(map->size, ARCH_CONVERT);
         }
@@ -896,7 +896,7 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index)
          * no good and we should just give up.
          */
         if (!hdr->holes && (sum < entsize))
-                return(XFS_ERROR(ENOSPC));
+                return XFS_ERROR(ENOSPC);
 
         /*
          * Compact the entries to coalesce free space.
@@ -909,18 +909,18 @@ xfs_dir_leaf_add(xfs_dabuf_t *bp, xfs_da_args_t *args, int index)
                                 (uint)sizeof(xfs_dir_leaf_entry_t) : 0,
                         args->justcheck);
         if (error)
-                return(error);
+                return error;
         /*
          * After compaction, the block is guaranteed to have only one
          * free region, in freemap[0].  If it is not big enough, give up.
          */
         if (INT_GET(hdr->freemap[0].size, ARCH_CONVERT) <
             (entsize + (uint)sizeof(xfs_dir_leaf_entry_t)))
-                return(XFS_ERROR(ENOSPC));
+                return XFS_ERROR(ENOSPC);
 
         if (!args->justcheck)
                 xfs_dir_leaf_add_work(bp, args, index, 0);
-        return(0);
+        return 0;
 }
 
 /*
@@ -1072,7 +1072,7 @@ xfs_dir_leaf_compact(xfs_trans_t *trans, xfs_dabuf_t *bp, int musthave,
         kmem_free(tmpbuffer, lbsize);
         if (musthave || justcheck)
                 kmem_free(tmpbuffer2, lbsize);
-        return(rval);
+        return rval;
 }
 
 /*
@@ -1292,7 +1292,7 @@ xfs_dir_leaf_figure_balance(xfs_da_state_t *state,
 
         *countarg = count;
         *namebytesarg = totallen;
-        return(foundit);
+        return foundit;
 }
 
 /*========================================================================
@@ -1334,7 +1334,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action)
                 INT_GET(leaf->hdr.namebytes, ARCH_CONVERT);
         if (bytes > (state->blocksize >> 1)) {
                 *action = 0;    /* blk over 50%, don't try to join */
-                return(0);
+                return 0;
         }
 
         /*
@@ -1353,13 +1353,13 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action)
                 error = xfs_da_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;
         }
 
         /*
@@ -1381,7 +1381,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action)
                                                             blkno, -1, &bp,
                                                             XFS_DATA_FORK);
                 if (error)
-                        return(error);
+                        return error;
                 ASSERT(bp != NULL);
 
                 leaf = (xfs_dir_leafblock_t *)info;
@@ -1402,7 +1402,7 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action)
         }
         if (i >= 2) {
                 *action = 0;
-                return(0);
+                return 0;
         }
         xfs_da_buf_done(bp);
 
@@ -1419,13 +1419,13 @@ xfs_dir_leaf_toosmall(xfs_da_state_t *state, int *action)
                                                  0, &retval);
         }
         if (error)
-                return(error);
+                return error;
         if (retval) {
                 *action = 0;
         } else {
                 *action = 1;
         }
-        return(0);
+        return 0;
 }
 
 /*
@@ -1575,8 +1575,8 @@ xfs_dir_leaf_remove(xfs_trans_t *trans, xfs_dabuf_t *bp, int index)
         tmp += INT_GET(leaf->hdr.count, ARCH_CONVERT) * ((uint)sizeof(xfs_dir_leaf_name_t) - 1);
         tmp += INT_GET(leaf->hdr.namebytes, ARCH_CONVERT);
         if (tmp < mp->m_dir_magicpct)
-                return(1);                      /* leaf is < 37% full */
-        return(0);
+                return 1;                       /* leaf is < 37% full */
+        return 0;
 }
 
 /*
@@ -1732,7 +1732,7 @@ xfs_dir_leaf_lookup_int(xfs_dabuf_t *bp, xfs_da_args_t *args, int *index)
         if ((probe == INT_GET(leaf->hdr.count, ARCH_CONVERT)) || (INT_GET(entry->hashval, ARCH_CONVERT) != hashval)) {
                 *index = probe;
                 ASSERT(args->oknoent);
-                return(XFS_ERROR(ENOENT));
+                return XFS_ERROR(ENOENT);
         }
 
         /*
@@ -1745,14 +1745,14 @@ xfs_dir_leaf_lookup_int(xfs_dabuf_t *bp, xfs_da_args_t *args, int *index)
                     memcmp(args->name, namest->name, args->namelen) == 0) {
                         XFS_DIR_SF_GET_DIRINO(&namest->inumber, &args->inumber);
                         *index = probe;
-                        return(XFS_ERROR(EEXIST));
+                        return XFS_ERROR(EEXIST);
                 }
                 entry++;
                 probe++;
         }
         *index = probe;
         ASSERT(probe == INT_GET(leaf->hdr.count, ARCH_CONVERT) || args->oknoent);
-        return(XFS_ERROR(ENOENT));
+        return XFS_ERROR(ENOENT);
 }
 
 /*========================================================================
@@ -1890,9 +1890,9 @@ xfs_dir_leaf_order(xfs_dabuf_t *leaf1_bp, xfs_dabuf_t *leaf2_bp)
               INT_GET(leaf1->entries[ 0 ].hashval, ARCH_CONVERT)) ||
              (INT_GET(leaf2->entries[ INT_GET(leaf2->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT) <
               INT_GET(leaf1->entries[ INT_GET(leaf1->hdr.count, ARCH_CONVERT)-1 ].hashval, ARCH_CONVERT)))) {
-                return(1);
+                return 1;
         }
-        return(0);
+        return 0;
 }
 
 /*
@@ -1942,7 +1942,7 @@ xfs_dir_leaf_getdents_int(
         leaf = bp->data;
         if (INT_GET(leaf->hdr.info.magic, ARCH_CONVERT) != XFS_DIR_LEAF_MAGIC) {
                 *eobp = 1;
-                return(XFS_ERROR(ENOENT));      /* XXX wrong code */
+                return XFS_ERROR(ENOENT);       /* XXX wrong code */
         }
 
         want_entno = XFS_DA_COOKIE_ENTRY(mp, uio->uio_offset);
@@ -2000,7 +2000,7 @@ xfs_dir_leaf_getdents_int(
                  * the node code will be setting uio_offset anyway.
                  */
                 *eobp = 0;
-                return(0);
+                return 0;
         }
         xfs_dir_trace_g_due("leaf: hash found", dp, uio, entry);
 
@@ -2057,7 +2057,7 @@ xfs_dir_leaf_getdents_int(
                         retval = xfs_da_read_buf(dp->i_transp, dp, thishash,
                                                  nextda, &bp2, XFS_DATA_FORK);
                         if (retval)
-                                return(retval);
+                                return retval;
 
                         ASSERT(bp2 != NULL);
 
@@ -2073,7 +2073,7 @@ xfs_dir_leaf_getdents_int(
                                                      leaf2);
                                 xfs_da_brelse(dp->i_transp, bp2);
 
-                                return(XFS_ERROR(EFSCORRUPTED));
+                                return XFS_ERROR(EFSCORRUPTED);
                         }
 
                         nexthash = INT_GET(leaf2->entries[0].hashval,
@@ -2139,7 +2139,7 @@ xfs_dir_leaf_getdents_int(
 
                         xfs_dir_trace_g_du("leaf: E-O-B", dp, uio);
 
-                        return(retval);
+                        return retval;
                 }
         }
 
@@ -2149,7 +2149,7 @@ xfs_dir_leaf_getdents_int(
 
         xfs_dir_trace_g_du("leaf: E-O-F", dp, uio);
 
-        return(0);
+        return 0;
 }
 
 /*
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c
index 163031c1e394..b4d971b01588 100644
--- a/fs/xfs/xfs_fsops.c
+++ b/fs/xfs/xfs_fsops.c
@@ -501,7 +501,7 @@ xfs_reserve_blocks(
         if (inval == (__uint64_t *)NULL) {
                 outval->resblks = mp->m_resblks;
                 outval->resblks_avail = mp->m_resblks_avail;
-                return(0);
+                return 0;
         }
 
         request = *inval;
@@ -537,7 +537,7 @@ xfs_reserve_blocks(
         outval->resblks = mp->m_resblks;
         outval->resblks_avail = mp->m_resblks_avail;
         XFS_SB_UNLOCK(mp, s);
-        return(0);
+        return 0;
 }
 
 void
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 3d9a36e77363..9176995160ed 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -403,7 +403,7 @@ xfs_log_release_iclog(xfs_mount_t *mp,
 
         if (xlog_state_release_iclog(log, iclog)) {
                 xfs_force_shutdown(mp, XFS_LOG_IO_ERROR);
-                return(EIO);
+                return EIO;
         }
 
         return 0;
@@ -556,7 +556,7 @@ xfs_log_unmount(xfs_mount_t *mp)
 
         error = xfs_log_unmount_write(mp);
         xfs_log_unmount_dealloc(mp);
-        return (error);
+        return error;
 }
 
 /*
@@ -728,7 +728,7 @@ xfs_log_write(xfs_mount_t *	mp,
         if ((error = xlog_write(mp, reg, nentries, tic, start_lsn, NULL, 0))) {
                 xfs_force_shutdown(mp, XFS_LOG_IO_ERROR);
         }
-        return (error);
+        return error;
 }       /* xfs_log_write */
 
 
@@ -836,7 +836,7 @@ xfs_log_need_covered(xfs_mount_t *mp)
                 needed = 1;
         }
         LOG_UNLOCK(log, s);
-        return(needed);
+        return needed;
 }
 
 /******************************************************************************
@@ -1003,7 +1003,7 @@ xlog_bdstrat_cb(struct xfs_buf *bp)
         XFS_BUF_ERROR(bp, EIO);
         XFS_BUF_STALE(bp);
         xfs_biodone(bp);
-        return (XFS_ERROR(EIO));
+        return XFS_ERROR(EIO);
 
 
 }
@@ -1263,7 +1263,7 @@ xlog_commit_record(xfs_mount_t  *mp,
                                iclog, XLOG_COMMIT_TRANS))) {
                 xfs_force_shutdown(mp, XFS_LOG_IO_ERROR);
         }
-        return (error);
+        return error;
 }       /* xlog_commit_record */
 
 
@@ -1460,7 +1460,7 @@ xlog_sync(xlog_t		*log,
         if ((error = XFS_bwrite(bp))) {
                 xfs_ioerror_alert("xlog_sync", log->l_mp, bp,
                                   XFS_BUF_ADDR(bp));
-                return (error);
+                return error;
         }
         if (split) {
                 bp              = iclog->ic_log->l_xbuf;
@@ -1498,10 +1498,10 @@ xlog_sync(xlog_t		*log,
                 if ((error = XFS_bwrite(bp))) {
                         xfs_ioerror_alert("xlog_sync (split)", log->l_mp,
                                           bp, XFS_BUF_ADDR(bp));
-                        return (error);
+                        return error;
                 }
         }
-        return (0);
+        return 0;
 }       /* xlog_sync */
 
 
@@ -1798,7 +1798,7 @@ xlog_write(xfs_mount_t *	mp,
     for (index = 0; index < nentries; ) {
         if ((error = xlog_state_get_iclog_space(log, len, &iclog, ticket,
                                                &contwr, &log_offset)))
-                return (error);
+                return error;
 
         ASSERT(log_offset <= iclog->ic_size - 1);
         ptr = (__psint_t) ((char *)iclog->ic_datap+log_offset);
@@ -1903,7 +1903,7 @@ xlog_write(xfs_mount_t *	mp,
                     xlog_state_finish_copy(log, iclog, record_cnt, data_cnt);
                     record_cnt = data_cnt = 0;
                     if ((error = xlog_state_release_iclog(log, iclog)))
-                            return (error);
+                            return error;
                     break;                      /* don't increment index */
             } else {                            /* copied entire region */
                 index++;
@@ -1917,7 +1917,7 @@ xlog_write(xfs_mount_t *	mp,
                         ASSERT(flags & XLOG_COMMIT_TRANS);
                         *commit_iclog = iclog;
                     } else if ((error = xlog_state_release_iclog(log, iclog)))
-                           return (error);
+                           return error;
                     if (index == nentries)
                             return 0;           /* we are done */
                     else
@@ -1934,7 +1934,7 @@ xlog_write(xfs_mount_t *	mp,
         *commit_iclog = iclog;
         return 0;
     }
-    return (xlog_state_release_iclog(log, iclog));
+    return xlog_state_release_iclog(log, iclog);
 }       /* xlog_write */
 
 
@@ -2050,7 +2050,7 @@ xlog_get_lowest_lsn(
             }
             lsn_log = lsn_log->ic_next;
         } while (lsn_log != log->l_iclog);
-        return(lowest_lsn);
+        return lowest_lsn;
 }
 
 
@@ -2402,7 +2402,7 @@ restart:
                 if (iclog->ic_refcnt == 1) {
                         LOG_UNLOCK(log, s);
                         if ((error = xlog_state_release_iclog(log, iclog)))
-                                return (error);
+                                return error;
                 } else {
                         iclog->ic_refcnt--;
                         LOG_UNLOCK(log, s);
@@ -2569,7 +2569,7 @@ xlog_regrant_write_log_space(xlog_t	   *log,
         XLOG_TIC_RESET_RES(tic);
 
         if (tic->t_cnt > 0)
-                return (0);
+                return 0;
 
 #ifdef DEBUG
         if (log->l_flags & XLOG_ACTIVE_RECOVERY)
@@ -2667,7 +2667,7 @@ redo:
         xlog_trace_loggrant(log, tic, "xlog_regrant_write_log_space: exit");
         xlog_verify_grant_head(log, 1);
         GRANT_UNLOCK(log, s);
-        return (0);
+        return 0;
 
 
  error_return:
@@ -2837,7 +2837,7 @@ xlog_state_release_iclog(xlog_t		*log,
         if (sync) {
                 return xlog_sync(log, iclog);
         }
-        return (0);
+        return 0;
 
 }       /* xlog_state_release_iclog */
 
@@ -3127,7 +3127,7 @@ try_again:
     } while (iclog != log->l_iclog);
 
     LOG_UNLOCK(log, s);
-    return (0);
+    return 0;
 }       /* xlog_state_sync */
 
 
@@ -3545,12 +3545,12 @@ xlog_state_ioerror(
                         ic->ic_state = XLOG_STATE_IOERROR;
                         ic = ic->ic_next;
                 } while (ic != iclog);
-                return (0);
+                return 0;
         }
         /*
          * Return non-zero, if state transition has already happened.
          */
-        return (1);
+        return 1;
 }
 
 /*
@@ -3587,7 +3587,7 @@ xfs_log_force_umount(
             log->l_flags & XLOG_ACTIVE_RECOVERY) {
                 mp->m_flags |= XFS_MOUNT_FS_SHUTDOWN;
                 XFS_BUF_DONE(mp->m_sb_bp);
-                return (0);
+                return 0;
         }
 
         /*
@@ -3596,7 +3596,7 @@ xfs_log_force_umount(
          */
         if (logerror && log->l_iclog->ic_state & XLOG_STATE_IOERROR) {
                 ASSERT(XLOG_FORCED_SHUTDOWN(log));
-                return (1);
+                return 1;
         }
         retval = 0;
         /*
@@ -3678,7 +3678,7 @@ xfs_log_force_umount(
         }
 #endif
         /* return non-zero if log IOERROR transition had already happened */
-        return (retval);
+        return retval;
 }
 
 STATIC int
@@ -3692,8 +3692,8 @@ xlog_iclogs_empty(xlog_t *log)
                  * any language.
                  */
                 if (iclog->ic_header.h_num_logops)
-                        return(0);
+                        return 0;
                 iclog = iclog->ic_next;
         } while (iclog != log->l_iclog);
-        return(1);
+        return 1;
 }
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 6088e14f84e3..62188ea392c7 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -646,7 +646,7 @@ xfs_mountfs(
 
         if (mp->m_sb_bp == NULL) {
                 if ((error = xfs_readsb(mp))) {
-                        return (error);
+                        return error;
                 }
         }
         xfs_mount_common(mp, sbp);
@@ -889,7 +889,7 @@ xfs_mountfs(
          * For client case we are done now
          */
         if (mfsi_flags & XFS_MFSI_CLIENT) {
-                return(0);
+                return 0;
         }
 
         /*
@@ -1182,7 +1182,7 @@ xfs_unmountfs_writesb(xfs_mount_t *mp)
                         xfs_fs_cmn_err(CE_ALERT, mp, "Superblock write error detected while unmounting.  Filesystem may not be marked shared readonly");
         }
         xfs_buf_relse(sbp);
-        return (error);
+        return error;
 }
 
 /*
@@ -1257,19 +1257,19 @@ xfs_mod_incore_sb_unlocked(xfs_mount_t *mp, xfs_sb_field_t field,
                 lcounter += delta;
                 if (lcounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_icount = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_IFREE:
                 lcounter = (long long)mp->m_sb.sb_ifree;
                 lcounter += delta;
                 if (lcounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_ifree = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_FDBLOCKS:
 
                 lcounter = (long long)mp->m_sb.sb_fdblocks;
@@ -1296,101 +1296,101 @@ xfs_mod_incore_sb_unlocked(xfs_mount_t *mp, xfs_sb_field_t field,
                                 if (rsvd) {
                                         lcounter = (long long)mp->m_resblks_avail + delta;
                                         if (lcounter < 0) {
-                                                return (XFS_ERROR(ENOSPC));
+                                                return XFS_ERROR(ENOSPC);
                                         }
                                         mp->m_resblks_avail = lcounter;
-                                        return (0);
+                                        return 0;
                                 } else {        /* not reserved */
-                                        return (XFS_ERROR(ENOSPC));
+                                        return XFS_ERROR(ENOSPC);
                                 }
                         }
                 }
 
                 mp->m_sb.sb_fdblocks = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_FREXTENTS:
                 lcounter = (long long)mp->m_sb.sb_frextents;
                 lcounter += delta;
                 if (lcounter < 0) {
-                        return (XFS_ERROR(ENOSPC));
+                        return XFS_ERROR(ENOSPC);
                 }
                 mp->m_sb.sb_frextents = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_DBLOCKS:
                 lcounter = (long long)mp->m_sb.sb_dblocks;
                 lcounter += delta;
                 if (lcounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_dblocks = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_AGCOUNT:
                 scounter = mp->m_sb.sb_agcount;
                 scounter += delta;
                 if (scounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_agcount = scounter;
-                return (0);
+                return 0;
         case XFS_SBS_IMAX_PCT:
                 scounter = mp->m_sb.sb_imax_pct;
                 scounter += delta;
                 if (scounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_imax_pct = scounter;
-                return (0);
+                return 0;
         case XFS_SBS_REXTSIZE:
                 scounter = mp->m_sb.sb_rextsize;
                 scounter += delta;
                 if (scounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_rextsize = scounter;
-                return (0);
+                return 0;
         case XFS_SBS_RBMBLOCKS:
                 scounter = mp->m_sb.sb_rbmblocks;
                 scounter += delta;
                 if (scounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_rbmblocks = scounter;
-                return (0);
+                return 0;
         case XFS_SBS_RBLOCKS:
                 lcounter = (long long)mp->m_sb.sb_rblocks;
                 lcounter += delta;
                 if (lcounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_rblocks = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_REXTENTS:
                 lcounter = (long long)mp->m_sb.sb_rextents;
                 lcounter += delta;
                 if (lcounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_rextents = lcounter;
-                return (0);
+                return 0;
         case XFS_SBS_REXTSLOG:
                 scounter = mp->m_sb.sb_rextslog;
                 scounter += delta;
                 if (scounter < 0) {
                         ASSERT(0);
-                        return (XFS_ERROR(EINVAL));
+                        return XFS_ERROR(EINVAL);
                 }
                 mp->m_sb.sb_rextslog = scounter;
-                return (0);
+                return 0;
         default:
                 ASSERT(0);
-                return (XFS_ERROR(EINVAL));
+                return XFS_ERROR(EINVAL);
         }
 }
 
@@ -1409,7 +1409,7 @@ xfs_mod_incore_sb(xfs_mount_t *mp, xfs_sb_field_t field, int delta, int rsvd)
         s = XFS_SB_LOCK(mp);
         status = xfs_mod_incore_sb_unlocked(mp, field, delta, rsvd);
         XFS_SB_UNLOCK(mp, s);
-        return (status);
+        return status;
 }
 
 /*
@@ -1470,7 +1470,7 @@ xfs_mod_incore_sb_batch(xfs_mount_t *mp, xfs_mod_sb_t *msb, uint nmsb, int rsvd)
                 }
         }
         XFS_SB_UNLOCK(mp, s);
-        return (status);
+        return status;
 }
 
 /*
@@ -1500,7 +1500,7 @@ xfs_getsb(
         }
         XFS_BUF_HOLD(bp);
         ASSERT(XFS_BUF_ISDONE(bp));
-        return (bp);
+        return bp;
 }
 
 /*
diff --git a/fs/xfs/xfs_trans_item.c b/fs/xfs/xfs_trans_item.c
index 486147ef0e3d..1117d600d741 100644
--- a/fs/xfs/xfs_trans_item.c
+++ b/fs/xfs/xfs_trans_item.c
@@ -78,7 +78,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
                 lidp->lid_size = 0;
                 lip->li_desc = lidp;
                 lip->li_mountp = tp->t_mountp;
-                return (lidp);
+                return lidp;
         }
 
         /*
@@ -119,7 +119,7 @@ xfs_trans_add_item(xfs_trans_t *tp, xfs_log_item_t *lip)
         lidp->lid_size = 0;
         lip->li_desc = lidp;
         lip->li_mountp = tp->t_mountp;
-        return (lidp);
+        return lidp;
 }
 
 /*
@@ -180,7 +180,7 @@ xfs_trans_find_item(xfs_trans_t	*tp, xfs_log_item_t *lip)
 {
         ASSERT(lip->li_desc != NULL);
 
-        return (lip->li_desc);
+        return lip->li_desc;
 }
 
 
@@ -219,10 +219,10 @@ xfs_trans_first_item(xfs_trans_t *tp)
                         continue;
                 }
 
-                return (XFS_LIC_SLOT(licp, i));
+                return XFS_LIC_SLOT(licp, i);
         }
         cmn_err(CE_WARN, "xfs_trans_first_item() -- no first item");
-        return(NULL);
+        return NULL;
 }
 
 
@@ -252,7 +252,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                         continue;
                 }
 
-                return (XFS_LIC_SLOT(licp, i));
+                return XFS_LIC_SLOT(licp, i);
         }
 
         /*
@@ -261,7 +261,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
          * If there is no next chunk, return NULL.
          */
         if (licp->lic_next == NULL) {
-                return (NULL);
+                return NULL;
         }
 
         licp = licp->lic_next;
@@ -271,7 +271,7 @@ xfs_trans_next_item(xfs_trans_t *tp, xfs_log_item_desc_t *lidp)
                         continue;
                 }
 
-                return (XFS_LIC_SLOT(licp, i));
+                return XFS_LIC_SLOT(licp, i);
         }
         ASSERT(0);
         /* NOTREACHED */
@@ -425,7 +425,7 @@ xfs_trans_unlock_chunk(
                 }
         }
 
-        return (freed);
+        return freed;
 }
 
 
@@ -478,7 +478,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
                  */
                 lbsp->lbc_ag = ag;
                 lbsp->lbc_idx = idx;
-                return (lbsp);
+                return lbsp;
         }
 
         /*
@@ -512,7 +512,7 @@ xfs_trans_add_busy(xfs_trans_t *tp, xfs_agnumber_t ag, xfs_extlen_t idx)
         tp->t_busy_free--;
         lbsp->lbc_ag = ag;
         lbsp->lbc_idx = idx;
-        return (lbsp);
+        return lbsp;
 }
 
 
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 8076cc981e11..eaab355f5a89 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -338,7 +338,7 @@ xfs_setattr(
                 code = XFS_QM_DQVOPALLOC(mp, ip, uid, gid, projid, qflags,
                                          &udqp, &gdqp);
                 if (code)
-                        return (code);
+                        return code;
         }
 
         /*
@@ -1027,11 +1027,8 @@ xfs_readlink(
 
         }
 
-
 error_return:
-
         xfs_iunlock(ip, XFS_ILOCK_SHARED);
-
         return error;
 }
 
@@ -1206,7 +1203,7 @@ xfs_inactive_free_eofblocks(
         last_fsb = XFS_B_TO_FSB(mp, (xfs_ufsize_t)XFS_MAXIOFFSET(mp));
         map_len = last_fsb - end_fsb;
         if (map_len <= 0)
-                return (0);
+                return 0;
 
         nimaps = 1;
         xfs_ilock(ip, XFS_ILOCK_SHARED);
@@ -1221,7 +1218,7 @@ xfs_inactive_free_eofblocks(
                  * Attach the dquots to the inode up front.
                  */
                 if ((error = XFS_QM_DQATTACH(mp, ip, 0)))
-                        return (error);
+                        return error;
 
                 /*
                  * There are blocks after the end of file.
@@ -1249,7 +1246,7 @@ xfs_inactive_free_eofblocks(
                         ASSERT(XFS_FORCED_SHUTDOWN(mp));
                         xfs_trans_cancel(tp, 0);
                         xfs_iunlock(ip, XFS_IOLOCK_EXCL);
-                        return (error);
+                        return error;
                 }
 
                 xfs_ilock(ip, XFS_ILOCK_EXCL);
@@ -1277,7 +1274,7 @@ xfs_inactive_free_eofblocks(
                 }
                 xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL);
         }
-        return (error);
+        return error;
 }
 
 /*
@@ -1455,7 +1452,7 @@ xfs_inactive_symlink_local(
         if (error) {
                 xfs_trans_cancel(*tpp, 0);
                 *tpp = NULL;
-                return (error);
+                return error;
         }
         xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
 
@@ -1468,7 +1465,7 @@ xfs_inactive_symlink_local(
                                   XFS_DATA_FORK);
                 ASSERT(ip->i_df.if_bytes == 0);
         }
-        return (0);
+        return 0;
 }
 
 /*
@@ -1494,7 +1491,7 @@ xfs_inactive_attrs(
         if (error) {
                 *tpp = NULL;
                 xfs_iunlock(ip, XFS_IOLOCK_EXCL);
-                return (error); /* goto out*/
+                return error; /* goto out */
         }
 
         tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE);
@@ -1507,7 +1504,7 @@ xfs_inactive_attrs(
                 xfs_trans_cancel(tp, 0);
                 *tpp = NULL;
                 xfs_iunlock(ip, XFS_IOLOCK_EXCL);
-                return (error);
+                return error;
         }
 
         xfs_ilock(ip, XFS_ILOCK_EXCL);
@@ -1518,7 +1515,7 @@ xfs_inactive_attrs(
         ASSERT(ip->i_d.di_anextents == 0);
 
         *tpp = tp;
-        return (0);
+        return 0;
 }
 
 STATIC int
@@ -1557,7 +1554,7 @@ xfs_release(
                     (!(ip->i_d.di_flags &
                                 (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)))) {
                         if ((error = xfs_inactive_free_eofblocks(mp, ip)))
-                                return (error);
+                                return error;
                         /* Update linux inode block count after free above */
                         LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp,
                                 ip->i_d.di_nblocks + ip->i_delayed_blks);
@@ -1638,7 +1635,7 @@ xfs_inactive(
                                 (XFS_DIFLAG_PREALLOC | XFS_DIFLAG_APPEND)) ||
                       (ip->i_delayed_blks != 0)))) {
                         if ((error = xfs_inactive_free_eofblocks(mp, ip)))
-                                return (VN_INACTIVE_CACHE);
+                                return VN_INACTIVE_CACHE;
                         /* Update linux inode block count after free above */
                         LINVFS_GET_IP(vp)->i_blocks = XFS_FSB_TO_BB(mp,
                                 ip->i_d.di_nblocks + ip->i_delayed_blks);
@@ -1649,7 +1646,7 @@ xfs_inactive(
         ASSERT(ip->i_d.di_nlink == 0);
 
         if ((error = XFS_QM_DQATTACH(mp, ip, 0)))
-                return (VN_INACTIVE_CACHE);
+                return VN_INACTIVE_CACHE;
 
         tp = xfs_trans_alloc(mp, XFS_TRANS_INACTIVE);
         if (truncate) {
@@ -1672,7 +1669,7 @@ xfs_inactive(
                         ASSERT(XFS_FORCED_SHUTDOWN(mp));
                         xfs_trans_cancel(tp, 0);
                         xfs_iunlock(ip, XFS_IOLOCK_EXCL);
-                        return (VN_INACTIVE_CACHE);
+                        return VN_INACTIVE_CACHE;
                 }
 
                 xfs_ilock(ip, XFS_ILOCK_EXCL);
@@ -1693,7 +1690,7 @@ xfs_inactive(
                         xfs_trans_cancel(tp,
                                 XFS_TRANS_RELEASE_LOG_RES | XFS_TRANS_ABORT);
                         xfs_iunlock(ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL);
-                        return (VN_INACTIVE_CACHE);
+                        return VN_INACTIVE_CACHE;
                 }
         } else if ((ip->i_d.di_mode & S_IFMT) == S_IFLNK) {
 
@@ -1707,7 +1704,7 @@ xfs_inactive(
 
                 if (error) {
                         ASSERT(tp == NULL);
-                        return (VN_INACTIVE_CACHE);
+                        return VN_INACTIVE_CACHE;
                 }
 
                 xfs_trans_ijoin(tp, ip, XFS_IOLOCK_EXCL | XFS_ILOCK_EXCL);
@@ -1720,7 +1717,7 @@ xfs_inactive(
                 if (error) {
                         ASSERT(XFS_FORCED_SHUTDOWN(mp));
                         xfs_trans_cancel(tp, 0);
-                        return (VN_INACTIVE_CACHE);
+                        return VN_INACTIVE_CACHE;
                 }
 
                 xfs_ilock(ip, XFS_ILOCK_EXCL | XFS_IOLOCK_EXCL);
@@ -1742,7 +1739,7 @@ xfs_inactive(
                  * cancelled, and the inode is unlocked. Just get out.
                  */
                  if (error)
-                         return (VN_INACTIVE_CACHE);
+                         return VN_INACTIVE_CACHE;
         } else if (ip->i_afp) {
                 xfs_idestroy_fork(ip, XFS_ATTR_FORK);
         }
@@ -2049,8 +2046,8 @@ std_return:
  abort_return:
         cancel_flags |= XFS_TRANS_ABORT;
         /* FALLTHROUGH */
- error_return:
 
+ error_return:
         if (tp != NULL)
                 xfs_trans_cancel(tp, cancel_flags);
 
@@ -2724,9 +2721,9 @@ std_return:
  abort_return:
         cancel_flags |= XFS_TRANS_ABORT;
         /* FALLTHROUGH */
+
  error_return:
         xfs_trans_cancel(tp, cancel_flags);
-
         goto std_return;
 }
 /*
@@ -3199,10 +3196,12 @@ std_return:
         }
         return error;
 
- error1:
+error1:
         xfs_bmap_cancel(&free_list);
         cancel_flags |= XFS_TRANS_ABORT;
- error_return:
+        /* FALLTHROUGH */
+
+error_return:
         xfs_trans_cancel(tp, cancel_flags);
         goto std_return;
 }
@@ -3618,9 +3617,9 @@ xfs_rwlock(
         if (locktype == VRWLOCK_WRITE) {
                 xfs_ilock(ip, XFS_IOLOCK_EXCL);
         } else if (locktype == VRWLOCK_TRY_READ) {
-                return (xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED));
+                return xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED);
         } else if (locktype == VRWLOCK_TRY_WRITE) {
-                return (xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL));
+                return xfs_ilock_nowait(ip, XFS_IOLOCK_EXCL);
         } else {
                 ASSERT((locktype == VRWLOCK_READ) ||
                        (locktype == VRWLOCK_WRITE_DIRECT));
@@ -3868,7 +3867,7 @@ xfs_finish_reclaim(
                         xfs_ifunlock(ip);
                         xfs_iunlock(ip, XFS_ILOCK_EXCL);
                 }
-                return(1);
+                return 1;
         }
         ip->i_flags |= XFS_IRECLAIM;
         write_unlock(&ih->ih_lock);
@@ -4045,7 +4044,7 @@ xfs_alloc_file_space(
                         offset, end_dmi_offset - offset,
                         0, NULL);
                 if (error)
-                        return(error);
+                        return error;
         }
 
         /*
@@ -4305,7 +4304,7 @@ xfs_free_file_space(
                                 offset, end_dmi_offset - offset,
                                 AT_DELAY_FLAG(attr_flags), NULL);
                 if (error)
-                        return(error);
+                        return error;
         }
 
         ASSERT(attr_flags & ATTR_NOLOCK ? attr_flags & ATTR_DMI : 1);