Skip to contentSkip to conversation

drbd: use get_random_u64() where appropriate

PATCH Applied David Carlier 3 participants 3 messages Apr 5 – Apr 7

Subsystems (2)
Block layer DRBD driver
lore
Share & tools
lore

David Carlier

author
#0 lore raw

PATCH v3 1/1 drbd: use get_random_u64() where appropriate

Use the typed random integer helpers instead of get_random_bytes() when filling a single integer variable. The helpers return the value directly, require no pointer or size argument, and better express intent.

Signed-off-by David Carlier <[email protected]>
---
 drivers/block/drbd/drbd_main.c | 4 ++--
 drivers/block/drbd/drbd_nl.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/block/drbd/drbd_main.c +2 -2
index 200d464e984b..b1a721dd0496 100644
@@ -874,7 +874,7 @@ void drbd_gen_and_send_sync_uuid(struct drbd_peer_device *peer_device)
 	if (uuid && uuid != UUID_JUST_CREATED)
 		uuid = uuid + UUID_NEW_BM_OFFSET;
 	else
-		get_random_bytes(&uuid, sizeof(u64));
+		uuid = get_random_u64();
 	drbd_uuid_set(device, UI_BITMAP, uuid);
 	drbd_print_uuids(device, "updated sync UUID");
 	drbd_md_sync(device);

@@ -3337,7 +3337,7 @@ void drbd_uuid_new_current(struct drbd_device *device) __must_hold(local)
 	u64 val;
 	unsigned long long bm_uuid;
 
-	get_random_bytes(&val, sizeof(u64));
+	val = get_random_u64();
 
 	spin_lock_irq(&device->ldev->md.uuid_lock);
 	bm_uuid = device->ldev->md.uuid[UI_BITMAP];
drivers/block/drbd/drbd_nl.c +1 -1
index e201f0087a0f..377f60b40f28 100644
@@ -3173,7 +3173,7 @@ int drbd_adm_resume_io(struct sk_buff *skb, struct genl_info *info)
 			 * matching real data uuid exists).
 			 */
 			u64 val;
-			get_random_bytes(&val, sizeof(u64));
+			val = get_random_u64();
 			drbd_set_ed_uuid(device, val);
 			drbd_warn(device, "Resumed without access to data; please tear down before attempting to re-configure.\n");
 		}
Signature · 1 line
2.53.0
maintainer Reviewed-by on v3 1/1
#1 lore raw
Quoted 10 lines · David Carlier

Use the typed random integer helpers instead of get_random_bytes() when filling a single integer variable. The helpers return the value directly, require no pointer or size argument, and better express intent.

Signed-off-by David Carlier <[email protected]>

---
drivers/block/drbd/drbd_main.c | 4 ++--
drivers/block/drbd/drbd_nl.c | 2 +-

2 files changed, 3 insertions(+), 3 deletions(-)

Maybe I just missed it, but v1 and v2 of this don't seem to exist? Anyway, the patch itself looks good, thanks.

Reviewed-by Christoph Böhmwalder <[email protected]>
maintainer Applied
#2 lore raw
In reply to David Carlier
Quoted 4 lines · David Carlier

Use the typed random integer helpers instead of get_random_bytes() when filling a single integer variable. The helpers return the value directly, require no pointer or size argument, and better express intent.

Applied, thanks!

[1/1] drbd: use get_random_u64() where appropriate

      commit: fa0cac9a515877fad856c860ad51107b86ed6c4f

Best regards,

Signature · 1 line
Jens Axboe