diff options
-rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 2 | ||||
-rw-r--r-- | include/linux/drbd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 4e8a543ded70..796eaf347dc0 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c | |||
@@ -4126,7 +4126,7 @@ static int receive_uuids(struct drbd_connection *connection, struct packet_info | |||
4126 | return config_unknown_volume(connection, pi); | 4126 | return config_unknown_volume(connection, pi); |
4127 | device = peer_device->device; | 4127 | device = peer_device->device; |
4128 | 4128 | ||
4129 | p_uuid = kmalloc(sizeof(u64)*UI_EXTENDED_SIZE, GFP_NOIO); | 4129 | p_uuid = kmalloc_array(UI_EXTENDED_SIZE, sizeof(*p_uuid), GFP_NOIO); |
4130 | if (!p_uuid) { | 4130 | if (!p_uuid) { |
4131 | drbd_err(device, "kmalloc of p_uuid failed\n"); | 4131 | drbd_err(device, "kmalloc of p_uuid failed\n"); |
4132 | return false; | 4132 | return false; |
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 002611c85318..2d0259327721 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
@@ -51,7 +51,7 @@ | |||
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | extern const char *drbd_buildtag(void); | 53 | extern const char *drbd_buildtag(void); |
54 | #define REL_VERSION "8.4.7" | 54 | #define REL_VERSION "8.4.10" |
55 | #define API_VERSION 1 | 55 | #define API_VERSION 1 |
56 | #define PRO_VERSION_MIN 86 | 56 | #define PRO_VERSION_MIN 86 |
57 | #define PRO_VERSION_MAX 101 | 57 | #define PRO_VERSION_MAX 101 |