aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-08-17 06:43:25 -0400
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 10:58:02 -0500
commita209b4aec31d4b672b7a70f5de272ebf6ce40e1b (patch)
tree76d1b913a30423968b14101bb873db092e6aac59 /drivers/block/drbd/drbd_req.c
parentc4e7afdc01b9496f81653959dac8093030c8f286 (diff)
drbd: Update some outdated comments to match the code
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_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 60fc186d0a3d..d61309db14a2 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -292,13 +292,12 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
292 292
293 if ((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)) { 293 if ((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)) {
294 /* this is disconnected (local only) operation, 294 /* this is disconnected (local only) operation,
295 * or protocol C P_WRITE_ACK, 295 * or protocol A, B, or C P_BARRIER_ACK,
296 * or protocol A or B P_BARRIER_ACK,
297 * or killed from the transfer log due to connection loss. */ 296 * or killed from the transfer log due to connection loss. */
298 _req_is_done(mdev, req, rw); 297 _req_is_done(mdev, req, rw);
299 } 298 }
300 /* else: network part and not DONE yet. that is 299 /* else: network part and not DONE yet. that is
301 * protocol A or B, barrier ack still pending... */ 300 * protocol A, B, or C, barrier ack still pending... */
302} 301}
303 302
304static void _req_may_be_done_not_susp(struct drbd_request *req, struct bio_and_error *m) 303static void _req_may_be_done_not_susp(struct drbd_request *req, struct bio_and_error *m)
@@ -668,7 +667,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
668 break; 667 break;
669 668
670 if (req->rq_state & RQ_NET_PENDING) { 669 if (req->rq_state & RQ_NET_PENDING) {
671 /* barrier came in before all requests have been acked. 670 /* barrier came in before all requests were acked.
672 * this is bad, because if the connection is lost now, 671 * this is bad, because if the connection is lost now,
673 * we won't be able to clean them up... */ 672 * we won't be able to clean them up... */
674 dev_err(DEV, "FIXME (BARRIER_ACKED but pending)\n"); 673 dev_err(DEV, "FIXME (BARRIER_ACKED but pending)\n");