From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755331AbcIJUeR (ORCPT ); Sat, 10 Sep 2016 16:34:17 -0400 Received: from mout.web.de ([217.72.192.78]:57937 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753223AbcIJUeP (ORCPT ); Sat, 10 Sep 2016 16:34:15 -0400 Subject: [PATCH 10/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_SyncParam() To: drbd-dev@lists.linbit.com, Lars Ellenberg , Philipp Reisner References: <3566e764-27b8-82e5-1f8e-c613e5a3a5b1@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall , Wolfram Sang From: SF Markus Elfring Message-ID: Date: Sat, 10 Sep 2016 22:33:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <3566e764-27b8-82e5-1f8e-c613e5a3a5b1@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Ex/7iMs7YQFcndKpCEL7hqFaONP19/xm8yThG9eTkjj3QWwf6PW FP+ht/nu7tnFzqjEn9EwldnB6SeaVcHBLHSkM2IPePalonc8QJJMY3aI+9FYSt45vDMZM5m G59So2Hu2ukXaz21VTUhtzEZvR6QVoeKLpbxgMxkAQx/OwxnW4DQ9ES17AkOTpuSEPhOTom 94jRdYxv3ga4+Pt/WIPGA== X-UI-Out-Filterresults: notjunk:1;V01:K0:lG5fH7Mfhzo=:ZxOs29/Zyxr2gj+JwXeExB 8ynZZNEJr28oXbkNjSeLRSvJTnAMXPgADDaexER7PrD50z6gWXv/kUT1YAtklR+PG8xh7BBu/ cvMlTctGOiI75+RsBBCzAhdOx2KPAk0UJqHGGaKBTA4sAYcht+7q18CzJDjY5bEfEnpqm2Jly N43u7Z7vupbgZiUpYUd7lKX713SK8wrDKpjYqsx4LjVF1jE+UeC/8U2BbHCkRNuyPTyX109v8 4ylw3rFjE94/REovsqjkc8NxnKBPKSVFsRnln5nXVdt++ZZAWLi6cjGssvbVQiON2tHQZRvNJ q2cl5isjy7anecj6HtH8OdaymUlimes1Vq0hC3u/T1nS08WpusYWoNb0FdudYreRd8zmZztnO NN1MewfkdNPMQ5rLBHkzGi2tkwDGq/wpvGU6x0r0BvLOk1R2rI4T6zRtRXA1P9Ra41ySaHYOV wGi4zgrG/5jzNiO3T+tuGVkg36uFONbztUL4AGKMdMSEaP0D2evMimJLDwsk7o3pIb5uoYIYY BwbuovisA8aEdfpZvF9aw5z90Zzp0yLwJeYGIw+sMFIYRkhkFct4kAep0YJRvP+v/HRwzpkTt Q8UH6wta2ONZqt4WjdAo8t7LOqjjlbwpqkjRnUxoa1VSneh7JAD4WPXmMAAy/UeSw2ZWWFefn d0LtXuyiQFq9o9Apx70us1AZsAUb9GveZznXtQDp1Q0mabeygvngyK4Z2hyAegOrvjmnyoXsT VGw6V9l8YZ28v7+oYTg1UU6kyzCETEIqNLBKP+6p4Lb5u4Q3JTkZN7ls7Aqz5M3Vt6yyonXAd 3sRhUO3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 10 Sep 2016 22:00:10 +0200 Omit three messages for memory allocation failures in this function. Link: http://events.linuxfoundation.org/sites/events/files/slides/LCJ16-Refactor_Strings-WSang_0.pdf Signed-off-by: Markus Elfring --- drivers/block/drbd/drbd_receiver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 6fbd968..3e1315a 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3863,7 +3863,6 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i if (!new_disk_conf) { put_ldev(device); mutex_unlock(&connection->resource->conf_update); - drbd_err(device, "Allocation of new disk_conf failed\n"); return -ENOMEM; } @@ -3938,7 +3937,6 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i if (fifo_size != device->rs_plan_s->size) { new_plan = fifo_alloc(fifo_size); if (!new_plan) { - drbd_err(device, "kmalloc of fifo_buffer failed"); put_ldev(device); goto disconnect; } @@ -3948,10 +3946,8 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i if (verify_tfm || csums_tfm) { new_net_conf = kzalloc(sizeof(*new_net_conf), GFP_KERNEL); - if (!new_net_conf) { - drbd_err(device, "Allocation of new net_conf failed\n"); + if (!new_net_conf) goto disconnect; - } *new_net_conf = *old_net_conf; -- 2.10.0