---

yaml --- r: 79683 b: refs/heads/master c: 85004cc h: refs/heads/master i: 79681: 6298c85 79679: 8cb61a4 v: v3
git-mirror · Jan 30, 2008 · d44e269 · d44e269
1 parent 27ec265
commit d44e269
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fbd67ad61f6d5a09ea717b56c50bc5c3d8042a8
+refs/heads/master: 85004cc367abc000aa36c0d0e270ab609a68b0cb
diff --git a/trunk/block/as-iosched.c b/trunk/block/as-iosched.c
@@ -1275,9 +1275,13 @@ static void as_merged_requests(struct request_queue *q, struct request *req,
 			 * Don't copy here but swap, because when anext is
 			 * removed below, it must contain the unused context
 			 */
-			double_spin_lock(&rioc->lock, &nioc->lock, rioc < nioc);
-			swap_io_context(&rioc, &nioc);
-			double_spin_unlock(&rioc->lock, &nioc->lock, rioc < nioc);
+			if (rioc != nioc) {
+				double_spin_lock(&rioc->lock, &nioc->lock,
+								rioc < nioc);
+				swap_io_context(&rioc, &nioc);
+				double_spin_unlock(&rioc->lock, &nioc->lock,
+								rioc < nioc);
+			}
 		}
 	}