---

yaml --- r: 346205 b: refs/heads/master c: 9d05e7c h: refs/heads/master i: 346203: a5c0b3d v: v3
git-mirror · Nov 8, 2012 · 944768b · 944768b
1 parent 5fe0cd7
commit 944768b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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. */