mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-07-06 00:13:38 -04:00
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>
This commit is contained in:
Jesper Juhl
Adrian Bunk
parent
46a9f65f8b
commit
014c2544e6
10 changed files with 275 additions and 275 deletions
|
|
@ -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;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue