From e5f107298ebece4796464b8da8844b763bb921e9 Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Thu, 1 Apr 2010 16:55:18 +0200 Subject: [PATCH] --- yaml --- r: 196837 b: refs/heads/master c: 8d1894ebe441093cfd967affcbc56b764960575e h: refs/heads/master i: 196835: 500005817631f0296f231d9e82080b310ca793ef v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 893e5ea1068c..f61d00d7ab1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0f83012dc510b0be92ee2d59227a573a36777b8 +refs/heads/master: 8d1894ebe441093cfd967affcbc56b764960575e diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index c786023001d2..93106fb92be8 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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));