orangefs: Delete error messages for a failed memory allocation in five 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>

5 files changed, 6 insertions, 19 deletions

diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index c19f0787c9c6..2826859bdc2c 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -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)) {
diff --git a/fs/orangefs/orangefs-bufmap.c b/fs/orangefs/orangefs-bufmap.c
index 038d67545d9f..7ef473f3d642 100644
--- a/fs/orangefs/orangefs-bufmap.c
+++ b/fs/orangefs/orangefs-bufmap.c
@@ -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;
 
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 716ed337f166..93fe8f8e60f1 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -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;
         }
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index c1b5174cb5a9..85ef87245a87 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -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;
         }
diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c
index 5a1bed6c8c6a..47f3fb9cbec4 100644
--- a/fs/orangefs/super.c
+++ b/fs/orangefs/super.c
@@ -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