patch-2.4.0-test5 linux/drivers/block/linear.c

• Lines: 18
• Date: Wed Jul 26 19:47:48 2000
• Orig file: v2.4.0-test4/linux/drivers/block/linear.c
• Orig date: Fri Jun 23 21:55:08 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/block/linear.c linux/drivers/block/linear.c
@@ -121,7 +121,7 @@
 	return 0;
 }
 
-static int linear_make_request (request_queue_t *q, mddev_t *mddev,
+static int linear_make_request (mddev_t *mddev,
 			int rw, struct buffer_head * bh)
 {
         linear_conf_t *conf = mddev_to_conf(mddev);
@@ -148,7 +148,7 @@
 		return -1;
 	}
 	bh->b_rdev = tmp_dev->dev;
-	bh->b_rsector = ((block - tmp_dev->offset) << 1) + (bh->b_rsector & 1);
+	bh->b_rsector = bh->b_rsector - (tmp_dev->offset << 1);
 
 	return 1;
 }