diff --git a/[refs] b/[refs] index 37a2bc2c1d27..6b1d41100073 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 629663c94242cfcff45abed61a019304ab85420c +refs/heads/master: 9d05e7c4e7069180370ce9c2c121fd6f7810c5a3 diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 9e65bad3e51b..843d0af68f96 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/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/trunk/drivers/block/drbd/drbd_req.c b/trunk/drivers/block/drbd/drbd_req.c index a3617f338269..34e791dfaf81 100644 --- a/trunk/drivers/block/drbd/drbd_req.c +++ b/trunk/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/trunk/drivers/block/drbd/drbd_req.h b/trunk/drivers/block/drbd/drbd_req.h index 492f81d3765a..f80af27fa5ed 100644 --- a/trunk/drivers/block/drbd/drbd_req.h +++ b/trunk/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. */