[Drbd-dev] [PATCH 12/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_protocol()

SF Markus Elfring elfring at users.sourceforge.net
Sat Sep 10 22:35:49 CEST 2016


From: Markus Elfring <elfring at 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 at 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



More information about the drbd-dev mailing list