Commit db445db1 authored by Christoph Böhmwalder's avatar Christoph Böhmwalder Committed by Jens Axboe
Browse files

drbd: drbd_uuid_compare: pass a peer_device 



Signed-off-by: default avatarChristoph Böhmwalder <christoph.boehmwalder@linbit.com>
Link: https://lore.kernel.org/r/20230330102744.2128122-2-christoph.boehmwalder@linbit.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 5e54c2a6

drivers/block/drbd/drbd_receiver.c

+5 −4
Original line number Diff line number Diff line
@@ -3226,10 +3226,11 @@ static void drbd_uuid_dump(struct drbd_device *device, char *text, u64 *uuid, 
-1096   requires proto 96

 */



static int drbd_uuid_compare(struct drbd_device *const device, enum drbd_role const peer_role, int *rule_nr) __must_hold(local)

static int drbd_uuid_compare(struct drbd_peer_device *const peer_device,

		enum drbd_role const peer_role, int *rule_nr) __must_hold(local)

{

	struct drbd_peer_device *const peer_device = first_peer_device(device);

	struct drbd_connection *const connection = peer_device ? peer_device->connection : NULL;

	struct drbd_connection *const connection = peer_device->connection;

	struct drbd_device *device = peer_device->device;

	u64 self, peer;

	int i, j;
@@ -3465,7 +3466,7 @@ static enum drbd_conns drbd_sync_handshake(struct drbd_peer_device *peer_device, 
	drbd_uuid_dump(device, "peer", device->p_uuid,

		       device->p_uuid[UI_SIZE], device->p_uuid[UI_FLAGS]);



	hg = drbd_uuid_compare(device, peer_role, &rule_nr);

	hg = drbd_uuid_compare(peer_device, peer_role, &rule_nr);

	spin_unlock_irq(&device->ldev->md.uuid_lock);



	drbd_info(device, "uuid_compare()=%d by rule %d\n", hg, rule_nr);