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

• Lines: 32
• Date: Wed Jun 21 10:10:02 2000
• Orig file: v2.4.0-test1/linux/drivers/block/linear.c
• Orig date: Fri May 12 14:18:55 2000

diff -u --recursive --new-file v2.4.0-test1/linux/drivers/block/linear.c linux/drivers/block/linear.c
@@ -148,7 +148,7 @@
 		return -1;
 	}
 	bh->b_rdev = tmp_dev->dev;
-	bh->b_rsector = (block - tmp_dev->offset) << 1;
+	bh->b_rsector = ((block - tmp_dev->offset) << 1) + (bh->b_rsector & 1);
 
 	return 1;
 }
@@ -183,17 +183,11 @@
 
 static mdk_personality_t linear_personality=
 {
-	"linear",
-	linear_make_request,
-	NULL,
-	linear_run,
-	linear_stop,
-	linear_status,
-	0,
-	NULL,
-	NULL,
-	NULL,
-	NULL
+	name:		"linear",
+	make_request:	linear_make_request,
+	run:		linear_run,
+	stop:		linear_stop,
+	status:		linear_status,
 };
 
 #ifndef MODULE