patch-2.1.128 linux/drivers/block/ll_rw_blk.c

• Lines: 21
• Date: Wed Nov 11 22:30:16 1998
• Orig file: v2.1.127/linux/drivers/block/ll_rw_blk.c
• Orig date: Fri Oct 23 22:01:20 1998

diff -u --recursive --new-file v2.1.127/linux/drivers/block/ll_rw_blk.c linux/drivers/block/ll_rw_blk.c
@@ -331,10 +331,16 @@
 		goto out;
 	}
 	for ( ; tmp->next ; tmp = tmp->next) {
-		if ((IN_ORDER(tmp,req) ||
-		    !IN_ORDER(tmp,tmp->next)) &&
-		    IN_ORDER(req,tmp->next))
-			break;
+		const int after_current = IN_ORDER(tmp,req);
+		const int before_next = IN_ORDER(req,tmp->next);
+
+		if (!IN_ORDER(tmp,tmp->next)) {
+			if (after_current || before_next)
+				break;
+		} else {
+			if (after_current && before_next)
+				break;
+		}
 	}
 	req->next = tmp->next;
 	tmp->next = req;