]> git.karo-electronics.de Git - linux-beck.git/commitdiff
IB/isert: Remove and fix debug prints after allocation failure
authorLeon Romanovsky <leon@kernel.org>
Thu, 3 Nov 2016 14:44:24 +0000 (16:44 +0200)
committerDoug Ledford <dledford@redhat.com>
Sat, 3 Dec 2016 18:12:52 +0000 (13:12 -0500)
The prints after [k|v][m|z|c]alloc() functions are not needed,
because in case of failure, allocator will print their internal
error prints anyway.

Signed-off-by: Leon Romanovsky <leon@kernel.org>
Acked-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/ulp/isert/ib_isert.c

index 6dd43f63238e8e68cbcd97b37947af039589a207..225cb8255563d163b0006a7c389f835547e1c62d 100644 (file)
@@ -184,7 +184,7 @@ isert_alloc_rx_descriptors(struct isert_conn *isert_conn)
        isert_conn->rx_descs = kzalloc(ISERT_QP_MAX_RECV_DTOS *
                                sizeof(struct iser_rx_desc), GFP_KERNEL);
        if (!isert_conn->rx_descs)
-               goto fail;
+               return -ENOMEM;
 
        rx_desc = isert_conn->rx_descs;
 
@@ -213,9 +213,7 @@ dma_map_fail:
        }
        kfree(isert_conn->rx_descs);
        isert_conn->rx_descs = NULL;
-fail:
        isert_err("conn %p failed to allocate rx descriptors\n", isert_conn);
-
        return -ENOMEM;
 }
 
@@ -269,10 +267,8 @@ isert_alloc_comps(struct isert_device *device)
 
        device->comps = kcalloc(device->comps_used, sizeof(struct isert_comp),
                                GFP_KERNEL);
-       if (!device->comps) {
-               isert_err("Unable to allocate completion contexts\n");
+       if (!device->comps)
                return -ENOMEM;
-       }
 
        max_cqe = min(ISER_MAX_CQ_LEN, device->ib_device->attrs.max_cqe);
 
@@ -432,10 +428,8 @@ isert_alloc_login_buf(struct isert_conn *isert_conn,
 
        isert_conn->login_req_buf = kzalloc(sizeof(*isert_conn->login_req_buf),
                        GFP_KERNEL);
-       if (!isert_conn->login_req_buf) {
-               isert_err("Unable to allocate isert_conn->login_buf\n");
+       if (!isert_conn->login_req_buf)
                return -ENOMEM;
-       }
 
        isert_conn->login_req_dma = ib_dma_map_single(ib_dev,
                                isert_conn->login_req_buf,
@@ -1276,11 +1270,8 @@ isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd
 
        if (payload_length) {
                text_in = kzalloc(payload_length, GFP_KERNEL);
-               if (!text_in) {
-                       isert_err("Unable to allocate text_in of payload_length: %u\n",
-                                 payload_length);
+               if (!text_in)
                        return -ENOMEM;
-               }
        }
        cmd->text_in_ptr = text_in;
 
@@ -2307,10 +2298,9 @@ isert_setup_np(struct iscsi_np *np,
        int ret;
 
        isert_np = kzalloc(sizeof(struct isert_np), GFP_KERNEL);
-       if (!isert_np) {
-               isert_err("Unable to allocate struct isert_np\n");
+       if (!isert_np)
                return -ENOMEM;
-       }
+
        sema_init(&isert_np->sem, 0);
        mutex_init(&isert_np->mutex);
        INIT_LIST_HEAD(&isert_np->accepted);
@@ -2651,7 +2641,6 @@ static int __init isert_init(void)
                                        WQ_UNBOUND | WQ_HIGHPRI, 0);
        if (!isert_comp_wq) {
                isert_err("Unable to allocate isert_comp_wq\n");
-               ret = -ENOMEM;
                return -ENOMEM;
        }