Skip to contentSkip to conversation

drivers/md compile fixes.

PATCH Gertjan van Wingerde 1 participant 2 messages Jan 6, 2002 MD RAID

lore
Share & tools
lore

Gertjan van Wingerde

author
#0 lore raw

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.

Signature · 11 lines
	Best regards/MvG,

		Gertjan

----------

Gertjan van Wingerde
Geessinkweg 177
7544 TX Enschede
The Netherlands
E-mail: [email protected]
drivers/md/md.c +2 -2
diff -u --recursive linux-2.5.2-pre8/drivers/md/md.c linux-2.5.x/drivers/md/md.c
@@ -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;
 		}
 	}
drivers/md/raid1.c +3 -3
diff -u --recursive linux-2.5.2-pre8/drivers/md/raid1.c linux-2.5.x/drivers/md/raid1.c
@@ -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;
author
#1 lore raw

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.

Quoted 6 lines · Gertjan van Wingerde

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.

Signature · 11 lines
	MvG,

		Gertjan

----------

Gertjan van Wingerde
Geessinkweg 177
7544 TX Enschede
The Netherlands
E-mail: [email protected]
drivers/md/md.c +1 -1
diff -u --recursive linux-2.5.2-pre8/drivers/md/md.c linux-2.5.x/drivers/md/md.c
@@ -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);