Commit 9a8e7753 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner
Browse files

drbd: Consistently use block_id == ID_SYNCER for checksum based resync and online verify 



DRBD_MAGIC has nothing to do with block ids and the funny values
computed were not actually used, anyway.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 39804853

drivers/block/drbd/drbd_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2474,7 +2474,7 @@ int drbd_send_drequest_csum(struct drbd_conf *mdev, 
	struct p_block_req p;



	p.sector   = cpu_to_be64(sector);

	p.block_id = BE_DRBD_MAGIC + 0xbeef;

	p.block_id = ID_SYNCER /* unused */;

	p.blksize  = cpu_to_be32(size);



	p.head.magic   = BE_DRBD_MAGIC;
@@ -2497,7 +2497,7 @@ int drbd_send_ov_request(struct drbd_conf *mdev, sector_t sector, int size) 
	struct p_block_req p;



	p.sector   = cpu_to_be64(sector);

	p.block_id = BE_DRBD_MAGIC + 0xbabe;

	p.block_id = ID_SYNCER /* unused */;

	p.blksize  = cpu_to_be32(size);



	ok = drbd_send_cmd(mdev, USE_DATA_SOCKET, P_OV_REQUEST,

drivers/block/drbd/drbd_receiver.c

+4 −0
Original line number Diff line number Diff line
@@ -341,6 +341,10 @@ struct drbd_epoch_entry *drbd_alloc_ee(struct drbd_conf *mdev, 
	e->size = data_size;

	e->flags = 0;

	e->sector = sector;

	/*

	 * The block_id is opaque to the receiver.  It is not endianness

	 * converted, and sent back to the sender unchanged.

	 */

	e->block_id = id;



	return e;

drivers/block/drbd/drbd_worker.c

+1 −3
Original line number Diff line number Diff line
@@ -305,8 +305,6 @@ int w_e_send_csum(struct drbd_conf *mdev, struct drbd_work *w, int cancel) 
	void *digest;

	int ok = 1;



	D_ASSERT(e->block_id == DRBD_MAGIC + 0xbeef);



	if (unlikely(cancel))

		goto out;
@@ -359,7 +357,7 @@ static int read_for_csum(struct drbd_conf *mdev, sector_t sector, int size) 


	/* GFP_TRY, because if there is no memory available right now, this may

	 * be rescheduled for later. It is "only" background resync, after all. */

	e = drbd_alloc_ee(mdev, DRBD_MAGIC+0xbeef, sector, size, GFP_TRY);

	e = drbd_alloc_ee(mdev, ID_SYNCER /* unused */, sector, size, GFP_TRY);

	if (!e)

		goto defer;