lkml.org 
[lkml]   [2015]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 14/21] drbd: clean-up receive_SyncParam()
Date
Initialize header_size then data_size once.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
drivers/block/drbd/drbd_receiver.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index ad9b99b..3ca6516 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3556,18 +3556,16 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i
return -EIO;
}

- if (apv <= 88) {
+ if (apv <= 88)
header_size = sizeof(struct p_rs_param);
- data_size = pi->size - header_size;
- } else if (apv <= 94) {
+ else if (apv <= 94)
header_size = sizeof(struct p_rs_param_89);
- data_size = pi->size - header_size;
- D_ASSERT(device, data_size == 0);
- } else {
+ else
header_size = sizeof(struct p_rs_param_95);
- data_size = pi->size - header_size;
+
+ data_size = pi->size - header_size;
+ if (apv > 88)
D_ASSERT(device, data_size == 0);
- }

/* initialize verify_alg and csums_alg */
p = pi->data;
--
2.1.4


\
 
 \ /
  Last update: 2015-11-27 22:41    [W:0.134 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site