Commit a209b4ae authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: Update some outdated comments to match the code

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent c4e7afdc
...@@ -389,8 +389,8 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want) ...@@ -389,8 +389,8 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
/* Trying kmalloc first, falling back to vmalloc. /* Trying kmalloc first, falling back to vmalloc.
* GFP_KERNEL is ok, as this is done when a lower level disk is * GFP_KERNEL is ok, as this is done when a lower level disk is
* "attached" to the drbd. Context is receiver thread or cqueue * "attached" to the drbd. Context is receiver thread or drbdsetup /
* thread. As we have no disk yet, we are not in the IO path, * netlink process. As we have no disk yet, we are not in the IO path,
* not even the IO path of the peer. */ * not even the IO path of the peer. */
bytes = sizeof(struct page *)*want; bytes = sizeof(struct page *)*want;
new_pages = kmalloc(bytes, GFP_KERNEL); new_pages = kmalloc(bytes, GFP_KERNEL);
......
...@@ -2038,7 +2038,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info) ...@@ -2038,7 +2038,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
goto fail; goto fail;
} }
/* allocation not in the IO path, cqueue thread context */ /* allocation not in the IO path, drbdsetup / netlink process context */
new_conf = kzalloc(sizeof(*new_conf), GFP_KERNEL); new_conf = kzalloc(sizeof(*new_conf), GFP_KERNEL);
if (!new_conf) { if (!new_conf) {
retcode = ERR_NOMEM; retcode = ERR_NOMEM;
......
...@@ -292,13 +292,12 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m) ...@@ -292,13 +292,12 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
if ((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)) { if ((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)) {
/* this is disconnected (local only) operation, /* this is disconnected (local only) operation,
* or protocol C P_WRITE_ACK, * or protocol A, B, or C P_BARRIER_ACK,
* or protocol A or B P_BARRIER_ACK,
* or killed from the transfer log due to connection loss. */ * or killed from the transfer log due to connection loss. */
_req_is_done(mdev, req, rw); _req_is_done(mdev, req, rw);
} }
/* else: network part and not DONE yet. that is /* else: network part and not DONE yet. that is
* protocol A or B, barrier ack still pending... */ * protocol A, B, or C, barrier ack still pending... */
} }
static void _req_may_be_done_not_susp(struct drbd_request *req, struct bio_and_error *m) static 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,7 +667,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
break; break;
if (req->rq_state & RQ_NET_PENDING) { if (req->rq_state & RQ_NET_PENDING) {
/* barrier came in before all requests have been acked. /* barrier came in before all requests were acked.
* this is bad, because if the connection is lost now, * this is bad, because if the connection is lost now,
* we won't be able to clean them up... */ * we won't be able to clean them up... */
dev_err(DEV, "FIXME (BARRIER_ACKED but pending)\n"); dev_err(DEV, "FIXME (BARRIER_ACKED but pending)\n");
......
...@@ -969,7 +969,7 @@ int w_e_end_data_req(struct drbd_work *w, int cancel) ...@@ -969,7 +969,7 @@ int w_e_end_data_req(struct drbd_work *w, int cancel)
} }
/** /**
* w_e_end_rsdata_req() - Worker callback to send a P_RS_DATA_REPLY packet in response to a P_RS_DATA_REQUESTRS * w_e_end_rsdata_req() - Worker callback to send a P_RS_DATA_REPLY packet in response to a P_RS_DATA_REQUEST
* @mdev: DRBD device. * @mdev: DRBD device.
* @w: work object. * @w: work object.
* @cancel: The connection will be closed anyways * @cancel: The connection will be closed anyways
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment