Skip to content

Commit

Permalink
orangefs: Delete error messages for a failed memory allocation in fiv…
Browse files Browse the repository at this point in the history
…e functions

Omit an extra message for a memory allocation failure in these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Mike Marshall <hubcap@omnibond.com>
  • Loading branch information
Markus Elfring authored and Mike Marshall committed Sep 14, 2017
1 parent 1217444 commit 07a2585
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 19 deletions.
9 changes: 3 additions & 6 deletions fs/orangefs/devorangefs-req.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,13 +461,10 @@ static ssize_t orangefs_devreq_write_iter(struct kiocb *iocb,
if (op->downcall.type != ORANGEFS_VFS_OP_READDIR)
goto wakeup;

op->downcall.trailer_buf =
vmalloc(op->downcall.trailer_size);
if (op->downcall.trailer_buf == NULL) {
gossip_err("%s: failed trailer vmalloc.\n",
__func__);
op->downcall.trailer_buf = vmalloc(op->downcall.trailer_size);
if (!op->downcall.trailer_buf)
goto Enomem;
}

memset(op->downcall.trailer_buf, 0, op->downcall.trailer_size);
if (!copy_from_iter_full(op->downcall.trailer_buf,
op->downcall.trailer_size, iter)) {
Expand Down
10 changes: 2 additions & 8 deletions fs/orangefs/orangefs-bufmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,14 @@ orangefs_bufmap_alloc(struct ORANGEFS_dev_map_desc *user_desc)

bufmap->buffer_index_array =
kzalloc(DIV_ROUND_UP(bufmap->desc_count, BITS_PER_LONG), GFP_KERNEL);
if (!bufmap->buffer_index_array) {
gossip_err("orangefs: could not allocate %d buffer indices\n",
bufmap->desc_count);
if (!bufmap->buffer_index_array)
goto out_free_bufmap;
}

bufmap->desc_array =
kcalloc(bufmap->desc_count, sizeof(struct orangefs_bufmap_desc),
GFP_KERNEL);
if (!bufmap->desc_array) {
gossip_err("orangefs: could not allocate %d descriptors\n",
bufmap->desc_count);
if (!bufmap->desc_array)
goto out_free_index_array;
}

bufmap->page_count = bufmap->total_size / PAGE_SIZE;

Expand Down
1 change: 0 additions & 1 deletion fs/orangefs/orangefs-debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,6 @@ static int orangefs_prepare_cdm_array(char *debug_array_string)
kzalloc(cdm_element_count * sizeof(struct client_debug_mask),
GFP_KERNEL);
if (!cdm_array) {
pr_info("malloc failed for cdm_array!\n");
rc = -ENOMEM;
goto out;
}
Expand Down
1 change: 0 additions & 1 deletion fs/orangefs/orangefs-mod.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ static int __init orangefs_init(void)
orangefs_htable_ops_in_progress =
kcalloc(hash_table_size, sizeof(struct list_head), GFP_KERNEL);
if (!orangefs_htable_ops_in_progress) {
gossip_err("Failed to initialize op hashtable");
ret = -ENOMEM;
goto cleanup_inode;
}
Expand Down
4 changes: 1 addition & 3 deletions fs/orangefs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,8 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb)
struct orangefs_inode_s *orangefs_inode;

orangefs_inode = kmem_cache_alloc(orangefs_inode_cache, GFP_KERNEL);
if (orangefs_inode == NULL) {
gossip_err("Failed to allocate orangefs_inode\n");
if (!orangefs_inode)
return NULL;
}

/*
* We want to clear everything except for rw_semaphore and the
Expand Down

0 comments on commit 07a2585

Please sign in to comment.