diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.28/drivers/block/umem.c linux-2.5.28-ac1/drivers/block/umem.c
--- linux-2.5.28/drivers/block/umem.c Thu Jul 25 11:09:40 2002
+++ linux-2.5.28-ac1/drivers/block/umem.c Thu Jul 25 12:04:29 2002
@@ -819,7 +819,7 @@
static int mm_revalidate(kdev_t i_rdev)
{
int card_number = DEVICE_NR(i_rdev);
- kdev_t device = mk_mdev(MAJOR_NR, card_number << MM_SHIFT);
+ kdev_t device = mk_kdev(MAJOR_NR, card_number << MM_SHIFT);
int res = dev_lock_part(device);
if (res < 0)
return res;
@@ -862,7 +862,7 @@
size = cards[card_number].mm_size * (1024 / MM_HARDSECT);
geo.heads = 64;
geo.sectors = 32;
- geo.start = get_start_sect(inode->i_bdev);
+ geo.start = get_start_sect(i->i_bdev);
geo.cylinders = size / (geo.heads * geo.sectors);
if (copy_to_user((void *) arg, &geo, sizeof(geo)))
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/