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>

diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
index 706e5220dd4a23f759c0b5e3b066452b9b081146..092f8273e6bd22820d8c806f4c8aee75fac73002 100644 (file)
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
@@ -389,8 +389,8 @@ static struct page **bm_realloc_pages(struct drbd_bitmap *b, unsigned long want)
 
        /* Trying kmalloc first, falling back to vmalloc.
         * GFP_KERNEL is ok, as this is done when a lower level disk is
-        * "attached" to the drbd.  Context is receiver thread or cqueue
-        * thread.  As we have no disk yet, we are not in the IO path,
+        * "attached" to the drbd.  Context is receiver thread or drbdsetup /
+        * netlink process.  As we have no disk yet, we are not in the IO path,
         * not even the IO path of the peer. */
        bytes = sizeof(struct page *)*want;
        new_pages = kmalloc(bytes, GFP_KERNEL);

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 92adb3dc82c2434800907e4a530e252504c701b0..684e2e4d48e13898c1f35b4155abcabd7611d01a 100644 (file)
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -2038,7 +2038,7 @@ int drbd_adm_connect(struct sk_buff *skb, struct genl_info *info)
                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);
        if (!new_conf) {
                retcode = ERR_NOMEM;

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 60fc186d0a3de74d4db1673210c82f85b9240cdc..d61309db14a2526c084e6799a6b921b8e86cd9ac 100644 (file)
--- 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)
 
        if ((s & RQ_NET_MASK) == 0 || (s & RQ_NET_DONE)) {
                /* this is disconnected (local only) operation,
-                * or protocol C P_WRITE_ACK,
-                * or protocol A or B P_BARRIER_ACK,
+                * or protocol A, B, or C P_BARRIER_ACK,
                 * or killed from the transfer log due to connection loss. */
                _req_is_done(mdev, req, rw);
        }
        /* 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)
@@ -668,7 +667,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
                        break;
 
                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,
                         * we won't be able to clean them up... */
                        dev_err(DEV, "FIXME (BARRIER_ACKED but pending)\n");

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index c57e47c0a1f5f8ea6e55ef5b5650621d716ca345..34a6065d95e699dad0ed8879c7dabd6daf4f0af3 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -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.
  * @w:         work object.
  * @cancel:    The connection will be closed anyways