patch-2.4.7 linux/drivers/block/elevator.c

Next file: linux/drivers/block/genhd.c
Previous file: linux/drivers/atm/nicstar.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.6/linux/drivers/block/elevator.c linux/drivers/block/elevator.c
@@ -92,7 +92,7 @@
 		if (__rq->elevator_sequence-- <= 0)
 			break;
 
-		if (__rq->sem)
+		if (__rq->waiting)
 			continue;
 		if (__rq->rq_dev != bh->b_rdev)
 			continue;
@@ -162,7 +162,7 @@
 			continue;
 		if (__rq->nr_sectors + count > max_sectors)
 			continue;
-		if (__rq->sem)
+		if (__rq->waiting)
 			continue;
 		if (__rq->sector + __rq->nr_sectors == bh->b_rsector) {
 			*req = __rq;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)