Skip to content

L
linux
Commit 25de0e37 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds
Browse files
Options

[PATCH] fix umem compile 

Whoever updated it was coding without due care and attention 8)
parent cb1632f7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/block/umem.c
View file @ 25de0e37
...@@ -819,7 +819,7 @@ static void del_battery_timer(void) ...@@ -819,7 +819,7 @@ static void del_battery_timer(void)
static int mm_revalidate(kdev_t i_rdev) static int mm_revalidate(kdev_t i_rdev)
{ {
int card_number = DEVICE_NR(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); int res = dev_lock_part(device);
if (res < 0) if (res < 0)
return res; return res;
...@@ -862,7 +862,7 @@ static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned ...@@ -862,7 +862,7 @@ static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned
size = cards[card_number].mm_size * (1024 / MM_HARDSECT); size = cards[card_number].mm_size * (1024 / MM_HARDSECT);
geo.heads = 64; geo.heads = 64;
geo.sectors = 32; 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); geo.cylinders = size / (geo.heads * geo.sectors);
if (copy_to_user((void *) arg, &geo, sizeof(geo))) if (copy_to_user((void *) arg, &geo, sizeof(geo)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7