diff options
| author | Andreas Gruenbacher | 2011-01-11 14:04:09 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2011-08-25 14:57:55 +0200 |
| commit | 9a8e77530fa7059044114bcf1a897a470ec21bc9 (patch) | |
| tree | 2561f734e7a3054bdf151495311cde4a582189e5 /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Remove superfluous declaration (diff) | |
| download | kernel-qcow2-linux-9a8e77530fa7059044114bcf1a897a470ec21bc9.tar.gz kernel-qcow2-linux-9a8e77530fa7059044114bcf1a897a470ec21bc9.tar.xz kernel-qcow2-linux-9a8e77530fa7059044114bcf1a897a470ec21bc9.zip | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 0358e55356c8..0c16620ecec5 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -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, |