drivers/md compile fixes.

drivers/md compile fixes.

[Gertjan van Wingerde]

[-- Attachment #1: Type: text/plain, Size: 269 bytes --]

Hi,

The attached patch to 2.5.2-pre9 is necessary to get it to compile and
to clean up some NODEV vs. mk_kdev(0, 0) usages.

-- 
	Best regards/MvG,

		Gertjan

----------

Gertjan van Wingerde
Geessinkweg 177
7544 TX Enschede
The Netherlands
E-mail: gwingerde@home.nl

[-- Attachment #2: linux-md.diff --]
[-- Type: text/plain, Size: 1409 bytes --]

diff -u --recursive linux-2.5.2-pre8/drivers/md/md.c linux-2.5.x/drivers/md/md.c
--- linux-2.5.2-pre8/drivers/md/md.c	Sun Jan  6 11:28:53 2002
+++ linux-2.5.x/drivers/md/md.c	Sun Jan  6 11:30:03 2002
@@ -641,7 +641,7 @@
 	int err = 0;
 	struct block_device *bdev;
 
-	bdev = bdget(rdev->dev);
+	bdev = bdget(kdev_t_to_nr(rdev->dev));
 	if (!bdev)
 		return -ENOMEM;
 	err = blkdev_get(bdev, FMODE_READ|FMODE_WRITE, 0, BDEV_RAW);
@@ -1132,7 +1132,7 @@
 						rdev->sb->this_disk.minor);
 			rdev->desc_nr = rdev->sb->this_disk.number;
 		} else {
-			rdev->old_dev = NODEV;
+			rdev->old_dev = mk_kdev(0, 0);
 			rdev->desc_nr = -1;
 		}
 	}
diff -u --recursive linux-2.5.2-pre8/drivers/md/raid1.c linux-2.5.x/drivers/md/raid1.c
--- linux-2.5.2-pre8/drivers/md/raid1.c	Sun Jan  6 11:28:53 2002
+++ linux-2.5.x/drivers/md/raid1.c	Fri Jan  4 21:53:52 2002
@@ -853,7 +853,7 @@
 
 		*d = failed_desc;
 
-		if (kdev_none(sdisk->dev))
+		if (kdev_same(sdisk->dev, mk_kdev(0,0)))
 			sdisk->used_slot = 0;
 		/*
 		 * this really activates the spare.
@@ -879,7 +879,7 @@
 			err = 1;
 			goto abort;
 		}
-		rdisk->dev = NODEV;
+		rdisk->dev = mk_kdev(0,0);
 		rdisk->used_slot = 0;
 		conf->nr_disks--;
 		break;
@@ -1428,7 +1428,7 @@
 
 			disk->number = descriptor->number;
 			disk->raid_disk = disk_idx;
-			disk->dev = NODEV;
+			disk->dev = mk_kdev(0,0);
 
 			disk->operational = 0;
 			disk->write_only = 0;

Re: drivers/md compile fixes.

[Gertjan van Wingerde]

[-- Attachment #1: Type: text/plain, Size: 501 bytes --]

Okay,

It seems that I f**ked up the patch creation. Actually only the first 
chunk of the patch is correct. New version of the patch attached.


         Best regards/MvG,

                 Gertjan.

Gertjan van Wingerde wrote:

> Hi,
> 
> The attached patch to 2.5.2-pre9 is necessary to get it to compile and
> to clean up some NODEV vs. mk_kdev(0, 0) usages.
> 
> 


-- 
	MvG,

		Gertjan

----------

Gertjan van Wingerde
Geessinkweg 177
7544 TX Enschede
The Netherlands
E-mail: gwingerde@home.nl

[-- Attachment #2: linux-md.diff --]
[-- Type: text/plain, Size: 429 bytes --]

diff -u --recursive linux-2.5.2-pre8/drivers/md/md.c linux-2.5.x/drivers/md/md.c
--- linux-2.5.2-pre8/drivers/md/md.c	Sun Jan  6 11:28:53 2002
+++ linux-2.5.x/drivers/md/md.c	Sun Jan  6 11:30:03 2002
@@ -641,7 +641,7 @@
 	int err = 0;
 	struct block_device *bdev;
 
-	bdev = bdget(rdev->dev);
+	bdev = bdget(kdev_t_to_nr(rdev->dev));
 	if (!bdev)
 		return -ENOMEM;
 	err = blkdev_get(bdev, FMODE_READ|FMODE_WRITE, 0, BDEV_RAW);