korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-17 09:14:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

xfs: clean up xfs_buf_item_get_format return value

Browse Source 
The only thing that can cause a nonzero return from
xfs_buf_item_get_format is if the kmem_alloc fails, which it can't.
Get rid of all the unnecessary error handling.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Darrick J. Wong 2020-01-08 09:21:22 -08:00
parent 0bb9d159bd
commit c64dd49b51
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fs/xfs/xfs_buf_item.c
View File

@ -688,7 +688,7 @@ static const struct xfs_item_ops xfs_buf_item_ops = {
.iop_push = xfs_buf_item_push, .iop_push = xfs_buf_item_push,
}; };
STATIC int STATIC void
xfs_buf_item_get_format( xfs_buf_item_get_format(
struct xfs_buf_log_item *bip, struct xfs_buf_log_item *bip,
int count) int count)
@ -698,14 +698,11 @@ xfs_buf_item_get_format(
if (count == 1) { if (count == 1) {
bip->bli_formats = &bip->__bli_format; bip->bli_formats = &bip->__bli_format;
return 0; return;
} }
bip->bli_formats = kmem_zalloc(count * sizeof(struct xfs_buf_log_format), bip->bli_formats = kmem_zalloc(count * sizeof(struct xfs_buf_log_format),
0); 0);
if (!bip->bli_formats)
return -ENOMEM;
return 0;
} }
STATIC void STATIC void
@ -731,7 +728,6 @@ xfs_buf_item_init(
struct xfs_buf_log_item *bip = bp->b_log_item; struct xfs_buf_log_item *bip = bp->b_log_item;
int chunks; int chunks;
int map_size; int map_size;
int error;
int i; int i;
/* /*
@ -760,13 +756,7 @@ xfs_buf_item_init(
* Discontiguous buffer support follows the layout of the underlying * Discontiguous buffer support follows the layout of the underlying
* buffer. This makes the implementation as simple as possible. * buffer. This makes the implementation as simple as possible.
*/ */
error = xfs_buf_item_get_format(bip, bp->b_map_count); xfs_buf_item_get_format(bip, bp->b_map_count);
ASSERT(error == 0);
if (error) { /* to stop gcc throwing set-but-unused warnings */
kmem_cache_free(xfs_buf_item_zone, bip);
return error;
}
for (i = 0; i < bip->bli_format_count; i++) { for (i = 0; i < bip->bli_format_count; i++) {
chunks = DIV_ROUND_UP(BBTOB(bp->b_maps[i].bm_len), chunks = DIV_ROUND_UP(BBTOB(bp->b_maps[i].bm_len),