drbd: rename drbd_restart_write to drbd_restart_request

Meanwhile, this is used to restart failed READ requests as well.

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_main.c b/drivers/block/drbd/drbd_main.c
index 9e65bad3e51be437982942ea9a92d29d695009a7..843d0af68f96a17cbe8544d52a90b3a65b2e342c 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2434,7 +2434,7 @@ static void do_retry(struct work_struct *ws)
        }
 }
 
-void drbd_restart_write(struct drbd_request *req)
+void drbd_restart_request(struct drbd_request *req)
 {
        unsigned long flags;
        spin_lock_irqsave(&retry.lock, flags);

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index a3617f338269d902857eb0fba50e4a0dc5597ade..34e791dfaf816049ff59acc08e3d0c7503338856 100644 (file)
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -144,7 +144,7 @@ static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const
        }
 
        if (s & RQ_POSTPONED)
-               drbd_restart_write(req);
+               drbd_restart_request(req);
        else
                drbd_req_free(req);
 }

diff --git a/drivers/block/drbd/drbd_req.h b/drivers/block/drbd/drbd_req.h
index 492f81d3765a16ca3503ddb37ccf906b64932f20..f80af27fa5ed1f5d79299403fdfa3cef5983e86c 100644 (file)
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
@@ -269,7 +269,7 @@ extern void tl_restart(struct drbd_tconn *tconn, enum drbd_req_event what);
 extern void _tl_restart(struct drbd_tconn *tconn, enum drbd_req_event what);
 
 /* this is in drbd_main.c */
-extern void drbd_restart_write(struct drbd_request *req);
+extern void drbd_restart_request(struct drbd_request *req);
 
 /* use this if you don't want to deal with calling complete_master_bio()
  * outside the spinlock, e.g. when walking some list on cleanup. */