aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2010-04-01 16:55:18 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-05-18 01:06:59 +0200
commit8d1894ebe441093cfd967affcbc56b764960575e (patch)
tree9dc8e3ea79f683502b712c8dea92cb67077576fa /drivers/block
parentdrbd: fix regression: attach while connected failed (diff)
downloadlinux-dev-8d1894ebe441093cfd967affcbc56b764960575e.tar.xz
linux-dev-8d1894ebe441093cfd967affcbc56b764960575e.zip
drbd: remove bogus ASSERT
block_id may be ID_SYNCER, as well as checksum based resync request magic, or online verify magic. Let's just drop that ASSERT. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_receiver.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index c786023001d2..93106fb92be8 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4233,7 +4233,6 @@ static int got_NegRSDReply(struct drbd_conf *mdev, struct p_header *h)
sector = be64_to_cpu(p->sector);
size = be32_to_cpu(p->blksize);
- D_ASSERT(p->block_id == ID_SYNCER);
update_peer_seq(mdev, be32_to_cpu(p->seq_num));