2002-01-06 13:00:26

by Gertjan van Wingerde

[permalink] [raw]

Subject: drivers/md compile fixes.

---

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;

---

Attachments:

linux-md.diff (1.38 kB)

2002-01-06 13:09:38

by Gertjan van Wingerde

[permalink] [raw]

Subject: Re: drivers/md compile fixes.

---

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);

---

Attachments:

linux-md.diff (429.00 B)