From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755396AbcIJUf6 (ORCPT ); Sat, 10 Sep 2016 16:35:58 -0400 Received: from mout.web.de ([212.227.17.12]:53150 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752992AbcIJUf4 (ORCPT ); Sat, 10 Sep 2016 16:35:56 -0400 Subject: [PATCH 12/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_protocol() 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:35:49 +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:8LOUNywXE1pRhSsV4iFho2LBtz4nAC02RMmGaIEIaFtac9RsbCW TXbc4KFpNoZ0AcblA/30KU4+eWB3uouXUWmBkVk3WA9OX9JYh446B/B+nI3WGz8Bk0nZka2 nt2a8A4JZPbWQzORFNwioyxheFKRVX0WNI3of8lhSmHSIHnhcRnfs88orsUpOEK5dmTPsMs 1NTTl3OqVVI/m5VSwL3Mw== X-UI-Out-Filterresults: notjunk:1;V01:K0:vo/Nxa8MeT4=:gF05ajwWN2REvhApS7W7sd h2rKJSyLmTbx0neiojU24vCnpO/DzBgZjlX5r+QTYT4KkzJn1Unf6IiNWB4lvuay5W+ctbvnr 4gDPejmQG8ywBcFMzzIOZSU8Iy/7U9MkUiF4evdDYtUJNpEaj4QpHP5SffwFuVAF20zyA7Mxv evDB8YiO3rL9ifC3eLtr9g0xtmw7q3VU27Xf1R5THHplFHVdzRPhgby0HJjKbgnueIJmaDnXl y/KFYAWvtckjut8VqIqGtPClEUPANiuX0D2AlQxFYNhcBJnwiQZ52qIEG1/mJ2/BQWWSo4PPY rV6suZYs2Yq6KlXX3yIMK3RycFxt6nMf72YfrIGSh0RbGgrfY9C1xJZ2WMW1RG4MelMkMoedS sB6lKMvTlj94XGXFdxaqOkQa8ssfRMZuFHH3pd/i6D9jYqF062vA4HHCc7FG1ZwV5piw8T+Eh yw+4aVl32WAA/8I3cWK59LU15BcFbg2iLo1F5ejtOvwkJkYO2QK+5RzZD9ad/9dxDW+YSR6Hm qB4xuGtBeHgoTcXW7DJ5DpqHMcaiaMPsbYaqxiRMxVEh0veSGIH1/cStU5Lx+HllTcshjvkgw fMJAZqgUQ7FR3sbLB5rkgr1i0xBZIbTTldDVmMO5y/Pq8lQT5tyqagS5B7BsOOQYB+FKah+YG CTc0pUPA8kxuV/PsBqCgNGbzqnzIY36sogf9i5n8rDZP28lziZ+noOMUBAJKGlSoLjXdm/ov1 DDw0sIOhIvVbmootqaHQ6zrp1TDAYYSaRIrmz4D8Hrk2Y7lPt1JbJlwy+LXDYyIHQTndIzBRy IMUliBt 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:04:08 +0200 Omit two 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 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index bbccdb8..e4da335 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -3691,17 +3691,13 @@ static int receive_protocol(struct drbd_connection *connection, struct packet_in hash_size = crypto_ahash_digestsize(peer_integrity_tfm); int_dig_in = kmalloc(hash_size, GFP_KERNEL); int_dig_vv = kmalloc(hash_size, GFP_KERNEL); - if (!(int_dig_in && int_dig_vv)) { - drbd_err(connection, "Allocation of buffers for data integrity checking failed\n"); + if (!(int_dig_in && int_dig_vv)) goto disconnect; - } } new_net_conf = kmalloc(sizeof(*new_net_conf), GFP_KERNEL); - if (!new_net_conf) { - drbd_err(connection, "Allocation of new net_conf failed\n"); + if (!new_net_conf) goto disconnect; - } mutex_lock(&connection->data.mutex); mutex_lock(&connection->resource->conf_update); -- 2.10.0