drbd: Rename drbd_endio_{pri,sec} -> drbd_{,peer_}request_endio

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_int.h b/drivers/block/drbd/drbd_int.h
index 93c4db3ac67ee14225716baa8a9d015495a993cd..93eb3a7ac71129fbacef953a777d8450f44a6083 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -661,7 +661,7 @@ struct drbd_request {
        /* if local IO is not allowed, will be NULL.
         * if local IO _is_ allowed, holds the locally submitted bio clone,
         * or, after local IO completion, the ERR_PTR(error).
-        * see drbd_endio_pri(). */
+        * see drbd_request_endio(). */
        struct bio *private_bio;
 
        struct drbd_interval i;

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 6b00650d2805440f979c6642ecd1e8c8d2efd1b6..1547c5106ab76224dbeac7aa784d5e8421bbaa61 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1136,7 +1136,7 @@ next_bio:
        bio->bi_bdev = mdev->ldev->backing_bdev;
        bio->bi_rw = rw;
        bio->bi_private = peer_req;
-       bio->bi_end_io = drbd_endio_sec;
+       bio->bi_end_io = drbd_peer_request_endio;
 
        bio->bi_next = bios;
        bios = bio;
@@ -1572,7 +1572,7 @@ static int receive_RSDataReply(struct drbd_conf *mdev, enum drbd_packet cmd,
        if (get_ldev(mdev)) {
                /* data is submitted to disk within recv_resync_read.
                 * corresponding put_ldev done below on error,
-                * or in drbd_endio_sec. */
+                * or in drbd_peer_request_endio. */
                ok = recv_resync_read(mdev, sector, data_size);
        } else {
                if (__ratelimit(&drbd_ratelimit_state))
@@ -1760,10 +1760,11 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packet cmd,
                return drbd_drain_block(mdev, data_size);
        }
 
-       /* get_ldev(mdev) successful.
-        * Corresponding put_ldev done either below (on various errors),
-        * or in drbd_endio_sec, if we successfully submit the data at
-        * the end of this function. */
+       /*
+        * Corresponding put_ldev done either below (on various errors), or in
+        * drbd_peer_request_endio, if we successfully submit the data at the
+        * end of this function.
+        */
 
        sector = be64_to_cpu(p->sector);
        peer_req = read_in_block(mdev, p->block_id, sector, data_size);

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 45a543e5c6a9bf32866328788d23fec94133dcd4..18eb3d17f174ad773c160d0b746d1df43c896293 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -116,7 +116,7 @@ static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const
                        drbd_set_in_sync(mdev, req->i.sector, req->i.size);
 
                /* one might be tempted to move the drbd_al_complete_io
-                * to the local io completion callback drbd_endio_pri.
+                * to the local io completion callback drbd_request_endio.
                 * but, if this was a mirror write, we may only
                 * drbd_al_complete_io after this is RQ_NET_DONE,
                 * otherwise the extent could be dropped from the al
@@ -252,7 +252,7 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m)
                 * what we need to do here is just: complete the master_bio.
                 *
                 * local completion error, if any, has been stored as ERR_PTR
-                * in private_bio within drbd_endio_pri.
+                * in private_bio within drbd_request_endio.
                 */
                int ok = (s & RQ_LOCAL_OK) || (s & RQ_NET_OK);
                int error = PTR_ERR(req->private_bio);

diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index e6232ce5a1ca97d6b2493c1c8c2b95ee181230fa..e6f2361d6b1902a5b56c9e3227736a5e1a80f378 100644 (file)
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -230,7 +230,7 @@ static inline void drbd_req_make_private_bio(struct drbd_request *req, struct bi
        req->private_bio = bio;
 
        bio->bi_private  = req;
-       bio->bi_end_io   = drbd_endio_pri;
+       bio->bi_end_io   = drbd_request_endio;
        bio->bi_next     = NULL;
 }
 

diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 2da2d23344f935269a1d0d6a14cfc2cc6f9868da..01ab0bc0cd9e58cea44116e7271cd3358ad4ead8 100644 (file)
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -45,8 +45,8 @@ static int w_make_resync_request(struct drbd_work *w, int cancel);
 
 /* endio handlers:
  *   drbd_md_io_complete (defined here)
- *   drbd_endio_pri (defined here)
- *   drbd_endio_sec (defined here)
+ *   drbd_request_endio (defined here)
+ *   drbd_peer_request_endio (defined here)
  *   bm_async_io_complete (defined in drbd_bitmap.c)
  *
  * For all these callbacks, note the following:
@@ -151,7 +151,7 @@ static void drbd_endio_write_sec_final(struct drbd_peer_request *peer_req) __rel
 /* writes on behalf of the partner, or resync writes,
  * "submitted" by the receiver.
  */
-void drbd_endio_sec(struct bio *bio, int error)
+void drbd_peer_request_endio(struct bio *bio, int error)
 {
        struct drbd_peer_request *peer_req = bio->bi_private;
        struct drbd_conf *mdev = peer_req->w.mdev;
@@ -187,7 +187,7 @@ void drbd_endio_sec(struct bio *bio, int error)
 
 /* read, readA or write requests on R_PRIMARY coming from drbd_make_request
  */
-void drbd_endio_pri(struct bio *bio, int error)
+void drbd_request_endio(struct bio *bio, int error)
 {
        unsigned long flags;
        struct drbd_request *req = bio->bi_private;

diff --git a/drivers/block/drbd/drbd_wrappers.h b/drivers/block/drbd/drbd_wrappers.h
index 151f1a37478f954360cd4fe91767922acf9ec1e7..decf9b282e8bb92ea50520b073a0321bf07ea905 100644 (file)
--- a/drivers/block/drbd/drbd_wrappers.h
+++ b/drivers/block/drbd/drbd_wrappers.h
@@ -20,8 +20,8 @@ static inline void drbd_set_my_capacity(struct drbd_conf *mdev,
 
 /* bi_end_io handlers */
 extern void drbd_md_io_complete(struct bio *bio, int error);
-extern void drbd_endio_sec(struct bio *bio, int error);
-extern void drbd_endio_pri(struct bio *bio, int error);
+extern void drbd_peer_request_endio(struct bio *bio, int error);
+extern void drbd_request_endio(struct bio *bio, int error);
 
 /*
  * used to submit our private bio