From: SF Markus Elfring <elfring@users.sourceforge.net>
To: drbd-dev@lists.linbit.com,
Lars Ellenberg <lars.ellenberg@linbit.com>,
Philipp Reisner <philipp.reisner@linbit.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Julia Lawall <julia.lawall@lip6.fr>,
Wolfram Sang <wsa@the-dreams.de>
Subject: [PATCH 12/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_protocol()
Date: Sat, 10 Sep 2016 22:35:49 +0200 [thread overview]
Message-ID: <c0785561-c7ea-0b0e-b144-3b8f3eba46e0@users.sourceforge.net> (raw)
In-Reply-To: <3566e764-27b8-82e5-1f8e-c613e5a3a5b1@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
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
next prev parent reply other threads:[~2016-09-10 20:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-10 20:20 [PATCH 00/13] DRBD-receiver: Fine-tuning for six function implementations SF Markus Elfring
2016-09-10 20:22 ` [PATCH 01/13] DRBD-receiver: Use kmalloc_array() in receive_uuids() SF Markus Elfring
2016-09-10 20:23 ` [PATCH 02/13] DRBD-receiver: Delete an error message for a failed kmalloc_array() call SF Markus Elfring
2016-09-10 20:24 ` [PATCH 03/13] DRBD-receiver: Move an assignment in receive_uuids() SF Markus Elfring
2016-09-10 20:25 ` [PATCH 04/13] DRBD-receiver: Improve a size determination in drbd_do_features() SF Markus Elfring
2016-09-10 20:26 ` [PATCH 05/13] DRBD-receiver: Delete an unnecessary initialisation in receive_sizes() SF Markus Elfring
2016-09-10 20:28 ` [PATCH 06/13] DRBD-receiver: Improve a size determination " SF Markus Elfring
2016-09-10 20:30 ` [PATCH 07/13] DRBD-receiver: Delete an error message for a failed kzalloc() call " SF Markus Elfring
2016-09-10 20:31 ` [PATCH 08/13] DRBD-receiver: Move an assignment " SF Markus Elfring
2016-09-10 20:32 ` [PATCH 09/13] DRBD-receiver: Improve determination of sizes in receive_SyncParam() SF Markus Elfring
2016-09-10 20:33 ` [PATCH 10/13] DRBD-receiver: Delete error messages for failed resource allocations " SF Markus Elfring
2016-09-10 20:34 ` [PATCH 11/13] DRBD-receiver: Improve a size determination in receive_protocol() SF Markus Elfring
2016-09-10 20:35 ` SF Markus Elfring [this message]
2016-09-10 20:36 ` [PATCH 13/13] DRBD-receiver: Improve determination of sizes in receive_Barrier() SF Markus Elfring
2017-08-06 10:18 ` [PATCH 00/13] DRBD-receiver: Fine-tuning for six function implementations SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c0785561-c7ea-0b0e-b144-3b8f3eba46e0@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=drbd-dev@lists.linbit.com \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=lars.ellenberg@linbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox