---

yaml --- r: 346213 b: refs/heads/master c: a0d856d h: refs/heads/master i: 346211: eb38982 v: v3
git-mirror · Nov 8, 2012 · 96e1dc8 · 96e1dc8
1 parent 8105b79
commit 96e1dc8
Show file tree

Hide file tree

Showing 5 changed files with 278 additions and 256 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b406777e6496de346e8ee12fa64e1fe0adc02a78
+refs/heads/master: a0d856dfaed16efb9600b2a7d147cb6dbc11ff94
diff --git a/trunk/drivers/block/drbd/drbd_int.h b/trunk/drivers/block/drbd/drbd_int.h
@@ -575,13 +575,14 @@ struct drbd_request {
 
 	struct list_head tl_requests; /* ring list in the transfer log */
 	struct bio *master_bio;       /* master bio pointer */
-	unsigned long rq_state; /* see comments above _req_mod() */
 	unsigned long start_time;
 
 	/* once it hits 0, we may complete the master_bio */
 	atomic_t completion_ref;
 	/* once it hits 0, we may destroy this drbd_request object */
 	struct kref kref;
+
+	unsigned rq_state; /* see comments above _req_mod() */
 };
 
 struct drbd_epoch {

diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c
@@ -210,7 +210,7 @@ void tl_release(struct drbd_tconn *tconn, unsigned int barrier_nr,
 	/* find latest not yet barrier-acked write request,
 	 * count writes in its epoch. */
 	list_for_each_entry(r, &tconn->transfer_log, tl_requests) {
-		const unsigned long s = r->rq_state;
+		const unsigned s = r->rq_state;
 		if (!req) {
 			if (!(s & RQ_WRITE))
 				continue;