aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 67768570141a..266ef24b3c74 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -611,13 +611,13 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
611 RQ_NET_DONE); 611 RQ_NET_DONE);
612 break; 612 break;
613 613
614 case DISCARD_WRITE: 614 case CONFLICT_RESOLVED:
615 /* for discarded conflicting writes of multiple primaries, 615 /* for superseded conflicting writes of multiple primaries,
616 * there is no need to keep anything in the tl, potential 616 * there is no need to keep anything in the tl, potential
617 * node crashes are covered by the activity log. 617 * node crashes are covered by the activity log.
618 * 618 *
619 * If this request had been marked as RQ_POSTPONED before, 619 * If this request had been marked as RQ_POSTPONED before,
620 * it will actually not be discarded, but "restarted", 620 * it will actually not be completed, but "restarted",
621 * resubmitted from the retry worker context. */ 621 * resubmitted from the retry worker context. */
622 D_ASSERT(req->rq_state & RQ_NET_PENDING); 622 D_ASSERT(req->rq_state & RQ_NET_PENDING);
623 D_ASSERT(req->rq_state & RQ_EXP_WRITE_ACK); 623 D_ASSERT(req->rq_state & RQ_EXP_WRITE_ACK);