Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1480708
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 10/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_SyncParam() |
| Date | 2016-09-10 22:40 +0200 |
| Message-ID | <sfXe9-4SK-3@gated-at.bofh.it> (permalink) |
| References | <sfX4t-4Pv-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/13] DRBD-receiver: Fine-tuning for six function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:30 +0200 [PATCH 01/13] DRBD-receiver: Use kmalloc_array() in receive_uuids() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:30 +0200 [PATCH 06/13] DRBD-receiver: Improve a size determination in receive_sizes() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:30 +0200 [PATCH 03/13] DRBD-receiver: Move an assignment in receive_uuids() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:30 +0200 [PATCH 10/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_SyncParam() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 08/13] DRBD-receiver: Move an assignment in receive_sizes() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 13/13] DRBD-receiver: Improve determination of sizes in receive_Barrier() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 09/13] DRBD-receiver: Improve determination of sizes in receive_SyncParam() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 12/13] DRBD-receiver: Delete error messages for failed resource allocations in receive_protocol() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 11/13] DRBD-receiver: Improve a size determination in receive_protocol() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200 [PATCH 07/13] DRBD-receiver: Delete an error message for a failed kzalloc() call in receive_sizes() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-10 22:40 +0200
csiph-web