Skip to content

L
linux
Commit 5682bcc6 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] bdev->bd_disk introduced 

There we go - now we can put a reference to gendisk into block_device.  Which
we do in do_open().  Most of the callers of get_gendisk() are simply using
bdev->bd_disk now (and most of the put_disk() calls introduced on previous
step disappear).  We also put that pointer into struct request - ->rq_disk.
That allows to get rid of disk_index() kludges in md.c (we simply count
relevant IO in the struct gendisk fields) and kill the export of get_gendisk().
	Notice that by now we can move _all_ IO counters into gendisk.  That
will kill a bunch of per-major arrays and more importantly, allow to merge
sard in clean way.  FWIW, we probably could show them as disk/partitions
attributes in driverfs...
parent 68c16870
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 133 deletions
drivers/block/genhd.c
View file @ 5682bcc6
...@@ -61,10 +61,7 @@ void add_disk(struct gendisk *disk) ...@@ -61,10 +61,7 @@ void add_disk(struct gendisk *disk)
{ {
write_lock(&gendisk_lock); write_lock(&gendisk_lock);
list_add(&disk->list, &gendisks[disk->major].list); list_add(&disk->list, &gendisks[disk->major].list);
if (disk->minors > 1) list_add_tail(&disk->full_list, &gendisk_list);
list_add_tail(&disk->full_list, &gendisk_list);
else
INIT_LIST_HEAD(&disk->full_list);
write_unlock(&gendisk_lock); write_unlock(&gendisk_lock);
disk->flags |= GENHD_FL_UP; disk->flags |= GENHD_FL_UP;
register_disk(disk); register_disk(disk);
...@@ -120,8 +117,6 @@ get_gendisk(dev_t dev, int *part) ...@@ -120,8 +117,6 @@ get_gendisk(dev_t dev, int *part)
return NULL; return NULL;
} }
EXPORT_SYMBOL(get_gendisk);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
/* iterator */ /* iterator */
static void *part_start(struct seq_file *part, loff_t *pos) static void *part_start(struct seq_file *part, loff_t *pos)
...@@ -158,7 +153,7 @@ static int show_partition(struct seq_file *part, void *v) ...@@ -158,7 +153,7 @@ static int show_partition(struct seq_file *part, void *v)
seq_puts(part, "major minor #blocks name\n\n"); seq_puts(part, "major minor #blocks name\n\n");
/* Don't show non-partitionable devices or empty devices */ /* Don't show non-partitionable devices or empty devices */
if (!get_capacity(sgp)) if (!get_capacity(sgp) || sgp->minors == 1)
return 0; return 0;
/* show the full disk and all non-0 size partitions of it */ /* show the full disk and all non-0 size partitions of it */
...@@ -239,6 +234,7 @@ struct gendisk *alloc_disk(int minors) ...@@ -239,6 +234,7 @@ struct gendisk *alloc_disk(int minors)
disk->minors = minors; disk->minors = minors;
while (minors >>= 1) while (minors >>= 1)
disk->minor_shift++; disk->minor_shift++;
INIT_LIST_HEAD(&disk->full_list);
disk->disk_dev.bus = &disk_bus; disk->disk_dev.bus = &disk_bus;
disk->disk_dev.release = disk_release; disk->disk_dev.release = disk_release;
disk->disk_dev.driver_data = disk; disk->disk_dev.driver_data = disk;
......
drivers/block/ioctl.c
View file @ 5682bcc6
...@@ -22,21 +22,12 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg) ...@@ -22,21 +22,12 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg)
return -EFAULT; return -EFAULT;
if (copy_from_user(&p, a.data, sizeof(struct blkpg_partition))) if (copy_from_user(&p, a.data, sizeof(struct blkpg_partition)))
return -EFAULT; return -EFAULT;
disk = get_gendisk(bdev->bd_dev, &part); disk = bdev->bd_disk;
if (!disk) if (bdev != bdev->bd_contains)
return -ENXIO;
if (bdev != bdev->bd_contains) {
put_disk(disk);
return -EINVAL; return -EINVAL;
}
if (part)
BUG();
part = p.pno; part = p.pno;
if (part <= 0 || part >= disk->minors) { if (part <= 0 || part >= disk->minors)
put_disk(disk);
return -EINVAL; return -EINVAL;
}
switch (a.op) { switch (a.op) {
case BLKPG_ADD_PARTITION: case BLKPG_ADD_PARTITION:
start = p.start >> 9; start = p.start >> 9;
...@@ -46,49 +37,33 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg) ...@@ -46,49 +37,33 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg)
sizeof(long long) > sizeof(long)) { sizeof(long long) > sizeof(long)) {
long pstart = start, plength = length; long pstart = start, plength = length;
if (pstart != start || plength != length if (pstart != start || plength != length
|| pstart < 0 || plength < 0) { || pstart < 0 || plength < 0)
put_disk(disk);
return -EINVAL; return -EINVAL;
}
} }
/* partition number in use? */ /* partition number in use? */
if (disk->part[part - 1].nr_sects != 0) { if (disk->part[part - 1].nr_sects != 0)
put_disk(disk);
return -EBUSY; return -EBUSY;
}
/* overlap? */ /* overlap? */
for (i = 0; i < disk->minors - 1; i++) { for (i = 0; i < disk->minors - 1; i++) {
struct hd_struct *s = &disk->part[i]; struct hd_struct *s = &disk->part[i];
if (!(start+length <= s->start_sect || if (!(start+length <= s->start_sect ||
start >= s->start_sect + s->nr_sects)) { start >= s->start_sect + s->nr_sects))
put_disk(disk);
return -EBUSY; return -EBUSY;
}
} }
/* all seems OK */ /* all seems OK */
add_partition(disk, part, start, length); add_partition(disk, part, start, length);
put_disk(disk);
return 0; return 0;
case BLKPG_DEL_PARTITION: case BLKPG_DEL_PARTITION:
if (disk->part[part - 1].nr_sects == 0) { if (disk->part[part - 1].nr_sects == 0)
put_disk(disk);
return -ENXIO; return -ENXIO;
}
/* partition in use? Incomplete check for now. */ /* partition in use? Incomplete check for now. */
bdevp = bdget(MKDEV(disk->major, disk->first_minor) + part); bdevp = bdget(MKDEV(disk->major, disk->first_minor) + part);
if (!bdevp) { if (!bdevp)
put_disk(disk);
return -ENOMEM; return -ENOMEM;
}
if (bd_claim(bdevp, &holder) < 0) { if (bd_claim(bdevp, &holder) < 0) {
bdput(bdevp); bdput(bdevp);
put_disk(disk);
return -EBUSY; return -EBUSY;
} }
/* all seems OK */ /* all seems OK */
fsync_bdev(bdevp); fsync_bdev(bdevp);
invalidate_bdev(bdevp, 0); invalidate_bdev(bdevp, 0);
...@@ -96,39 +71,25 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg) ...@@ -96,39 +71,25 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg *arg)
delete_partition(disk, part); delete_partition(disk, part);
bd_release(bdevp); bd_release(bdevp);
bdput(bdevp); bdput(bdevp);
put_disk(disk);
return 0; return 0;
default: default:
put_disk(disk);
return -EINVAL; return -EINVAL;
} }
} }
static int blkdev_reread_part(struct block_device *bdev) static int blkdev_reread_part(struct block_device *bdev)
{ {
int part; struct gendisk *disk = bdev->bd_disk;
struct gendisk *disk = get_gendisk(bdev->bd_dev, &part); int res;
int res = 0;
if (!disk) if (disk->minors == 1 || bdev != bdev->bd_contains)
return -EINVAL;
if (disk->minors == 1 || bdev != bdev->bd_contains) {
put_disk(disk);
return -EINVAL; return -EINVAL;
} if (!capable(CAP_SYS_ADMIN))
if (part)
BUG();
if (!capable(CAP_SYS_ADMIN)) {
put_disk(disk);
return -EACCES; return -EACCES;
} if (down_trylock(&bdev->bd_sem))
if (down_trylock(&bdev->bd_sem)) {
put_disk(disk);
return -EBUSY; return -EBUSY;
}
res = rescan_partitions(disk, bdev); res = rescan_partitions(disk, bdev);
up(&bdev->bd_sem); up(&bdev->bd_sem);
put_disk(disk);
return res; return res;
} }
......
drivers/block/ll_rw_blk.c
View file @ 5682bcc6
...@@ -1427,7 +1427,19 @@ void drive_stat_acct(struct request *rq, int nr_sectors, int new_io) ...@@ -1427,7 +1427,19 @@ void drive_stat_acct(struct request *rq, int nr_sectors, int new_io)
int rw = rq_data_dir(rq); int rw = rq_data_dir(rq);
unsigned int index; unsigned int index;
index = disk_index(rq->rq_dev); if (!rq->rq_disk)
return;
if (rw == READ) {
rq->rq_disk->rio += new_io;
rq->rq_disk->reads += nr_sectors;
} else if (rw == WRITE) {
rq->rq_disk->wio += new_io;
rq->rq_disk->writes += nr_sectors;
}
index = rq->rq_disk->first_minor >> rq->rq_disk->minor_shift;
if ((index >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR)) if ((index >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR))
return; return;
...@@ -1747,6 +1759,7 @@ static int __make_request(request_queue_t *q, struct bio *bio) ...@@ -1747,6 +1759,7 @@ static int __make_request(request_queue_t *q, struct bio *bio)
req->waiting = NULL; req->waiting = NULL;
req->bio = req->biotail = bio; req->bio = req->biotail = bio;
req->rq_dev = to_kdev_t(bio->bi_bdev->bd_dev); req->rq_dev = to_kdev_t(bio->bi_bdev->bd_dev);
req->rq_disk = bio->bi_bdev->bd_disk;
add_request(q, req, insert_here); add_request(q, req, insert_here);
out: out:
if (freereq) if (freereq)
......
drivers/block/rd.c
View file @ 5682bcc6
...@@ -381,6 +381,7 @@ static int rd_open(struct inode * inode, struct file * filp) ...@@ -381,6 +381,7 @@ static int rd_open(struct inode * inode, struct file * filp)
rd_bdev[unit]->bd_inode->i_mapping->a_ops = &ramdisk_aops; rd_bdev[unit]->bd_inode->i_mapping->a_ops = &ramdisk_aops;
rd_bdev[unit]->bd_inode->i_size = rd_length[unit]; rd_bdev[unit]->bd_inode->i_size = rd_length[unit];
rd_bdev[unit]->bd_queue = &blk_dev[MAJOR_NR].request_queue; rd_bdev[unit]->bd_queue = &blk_dev[MAJOR_NR].request_queue;
rd_bdev[unit]->bd_disk = get_disk(rd_disks[unit]);
} }
return 0; return 0;
......
drivers/md/md.c
View file @ 5682bcc6
...@@ -2731,18 +2731,9 @@ int unregister_md_personality(int pnum) ...@@ -2731,18 +2731,9 @@ int unregister_md_personality(int pnum)
return 0; return 0;
} }
static unsigned int sync_io[DK_MAX_MAJOR][DK_MAX_DISK];
void md_sync_acct(mdk_rdev_t *rdev, unsigned long nr_sectors) void md_sync_acct(mdk_rdev_t *rdev, unsigned long nr_sectors)
{ {
kdev_t dev = to_kdev_t(rdev->bdev->bd_dev); rdev->bdev->bd_disk->sync_io += nr_sectors;
unsigned int major = major(dev);
unsigned int index;
index = disk_index(dev);
if ((index >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR))
return;
sync_io[major][index] += nr_sectors;
} }
static int is_mddev_idle(mddev_t *mddev) static int is_mddev_idle(mddev_t *mddev)
...@@ -2754,16 +2745,8 @@ static int is_mddev_idle(mddev_t *mddev) ...@@ -2754,16 +2745,8 @@ static int is_mddev_idle(mddev_t *mddev)
idle = 1; idle = 1;
ITERATE_RDEV(mddev,rdev,tmp) { ITERATE_RDEV(mddev,rdev,tmp) {
kdev_t dev = to_kdev_t(rdev->bdev->bd_dev); struct gendisk *disk = rdev->bdev->bd_disk;
int major = major(dev); curr_events = disk->reads + disk->writes - disk->sync_io;
int idx = disk_index(dev);
if ((idx >= DK_MAX_DISK) || (major >= DK_MAX_MAJOR))
continue;
curr_events = kstat.dk_drive_rblk[major][idx] +
kstat.dk_drive_wblk[major][idx] ;
curr_events -= sync_io[major][idx];
if ((curr_events - rdev->last_events) > 32) { if ((curr_events - rdev->last_events) > 32) {
rdev->last_events = curr_events; rdev->last_events = curr_events;
idle = 0; idle = 0;
......
fs/block_dev.c
View file @ 5682bcc6
...@@ -526,8 +526,6 @@ int check_disk_change(struct block_device *bdev) ...@@ -526,8 +526,6 @@ int check_disk_change(struct block_device *bdev)
{ {
struct block_device_operations * bdops = bdev->bd_op; struct block_device_operations * bdops = bdev->bd_op;
kdev_t dev = to_kdev_t(bdev->bd_dev); kdev_t dev = to_kdev_t(bdev->bd_dev);
struct gendisk *disk;
int part;
if (bdops->check_media_change == NULL) if (bdops->check_media_change == NULL)
return 0; return 0;
...@@ -537,26 +535,21 @@ int check_disk_change(struct block_device *bdev) ...@@ -537,26 +535,21 @@ int check_disk_change(struct block_device *bdev)
if (invalidate_device(dev, 0)) if (invalidate_device(dev, 0))
printk("VFS: busy inodes on changed media.\n"); printk("VFS: busy inodes on changed media.\n");
disk = get_gendisk(bdev->bd_dev, &part);
if (bdops->revalidate) if (bdops->revalidate)
bdops->revalidate(dev); bdops->revalidate(dev);
if (disk && disk->minors > 1) if (bdev->bd_disk->minors > 1)
bdev->bd_invalidated = 1; bdev->bd_invalidated = 1;
put_disk(disk);
return 1; return 1;
} }
int full_check_disk_change(struct block_device *bdev) int full_check_disk_change(struct block_device *bdev)
{ {
int res = 0; int res = 0;
int n;
if (bdev->bd_contains != bdev) if (bdev->bd_contains != bdev)
BUG(); BUG();
down(&bdev->bd_sem); down(&bdev->bd_sem);
if (check_disk_change(bdev)) { if (check_disk_change(bdev)) {
struct gendisk *disk = get_gendisk(bdev->bd_dev, &n); rescan_partitions(bdev->bd_disk, bdev);
rescan_partitions(disk, bdev);
put_disk(disk);
res = 1; res = 1;
} }
up(&bdev->bd_sem); up(&bdev->bd_sem);
...@@ -598,6 +591,8 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file * ...@@ -598,6 +591,8 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
kdev_t dev = to_kdev_t(bdev->bd_dev); kdev_t dev = to_kdev_t(bdev->bd_dev);
struct module *owner = NULL; struct module *owner = NULL;
struct block_device_operations *ops, *old; struct block_device_operations *ops, *old;
struct gendisk *disk;
int part;
lock_kernel(); lock_kernel();
ops = get_blkfops(major(dev)); ops = get_blkfops(major(dev));
...@@ -617,53 +612,41 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file * ...@@ -617,53 +612,41 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
if (owner) if (owner)
__MOD_DEC_USE_COUNT(owner); __MOD_DEC_USE_COUNT(owner);
} }
disk = get_gendisk(bdev->bd_dev, &part);
if (!disk)
goto out1;
if (!bdev->bd_contains) { if (!bdev->bd_contains) {
int part;
struct gendisk *g = get_gendisk(bdev->bd_dev, &part);
bdev->bd_contains = bdev; bdev->bd_contains = bdev;
if (g && part) { if (part) {
struct block_device *disk; struct block_device *whole;
disk = bdget(MKDEV(g->major, g->first_minor)); whole = bdget(MKDEV(disk->major, disk->first_minor));
ret = -ENOMEM; ret = -ENOMEM;
if (!disk) { if (!whole)
put_disk(g);
goto out1; goto out1;
} ret = blkdev_get(whole, file->f_mode, file->f_flags, BDEV_RAW);
ret = blkdev_get(disk, file->f_mode, file->f_flags, BDEV_RAW); if (ret)
if (ret) {
put_disk(g);
goto out1; goto out1;
} bdev->bd_contains = whole;
bdev->bd_contains = disk;
} }
put_disk(g);
} }
if (bdev->bd_contains == bdev) { if (bdev->bd_contains == bdev) {
int part; if (!bdev->bd_openers)
struct gendisk *g = get_gendisk(bdev->bd_dev, &part); bdev->bd_disk = disk;
if (!bdev->bd_queue) { if (!bdev->bd_queue) {
struct blk_dev_struct *p = blk_dev + major(dev); struct blk_dev_struct *p = blk_dev + major(dev);
bdev->bd_queue = &p->request_queue; bdev->bd_queue = &p->request_queue;
if (p->queue) if (p->queue)
bdev->bd_queue = p->queue(dev); bdev->bd_queue = p->queue(dev);
} }
if (bdev->bd_op->open) { if (bdev->bd_op->open) {
ret = bdev->bd_op->open(inode, file); ret = bdev->bd_op->open(inode, file);
if (ret) { if (ret)
put_disk(g);
goto out2; goto out2;
}
} }
if (!bdev->bd_openers) { if (!bdev->bd_openers) {
struct backing_dev_info *bdi; struct backing_dev_info *bdi;
sector_t sect = 0;
bdev->bd_offset = 0; bdev->bd_offset = 0;
if (g) bd_set_size(bdev, (loff_t)get_capacity(disk) << 9);
sect = get_capacity(g);
bd_set_size(bdev, (loff_t)sect << 9);
bdi = blk_get_backing_dev_info(bdev); bdi = blk_get_backing_dev_info(bdev);
if (bdi == NULL) if (bdi == NULL)
bdi = &default_backing_dev_info; bdi = &default_backing_dev_info;
...@@ -671,34 +654,31 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file * ...@@ -671,34 +654,31 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
bdev->bd_inode->i_data.backing_dev_info = bdi; bdev->bd_inode->i_data.backing_dev_info = bdi;
} }
if (bdev->bd_invalidated) if (bdev->bd_invalidated)
rescan_partitions(g, bdev); rescan_partitions(disk, bdev);
put_disk(g);
} else { } else {
down(&bdev->bd_contains->bd_sem); down(&bdev->bd_contains->bd_sem);
bdev->bd_contains->bd_part_count++; bdev->bd_contains->bd_part_count++;
if (!bdev->bd_openers) { if (!bdev->bd_openers) {
int part;
struct gendisk *g = get_gendisk(bdev->bd_dev, &part);
struct hd_struct *p; struct hd_struct *p;
p = g->part + part - 1; p = disk->part + part - 1;
inode->i_data.backing_dev_info = inode->i_data.backing_dev_info =
bdev->bd_inode->i_data.backing_dev_info = bdev->bd_inode->i_data.backing_dev_info =
bdev->bd_contains->bd_inode->i_data.backing_dev_info; bdev->bd_contains->bd_inode->i_data.backing_dev_info;
if (!(g->flags & GENHD_FL_UP) || !p->nr_sects) { if (!(disk->flags & GENHD_FL_UP) || !p->nr_sects) {
bdev->bd_contains->bd_part_count--; bdev->bd_contains->bd_part_count--;
up(&bdev->bd_contains->bd_sem); up(&bdev->bd_contains->bd_sem);
put_disk(g);
ret = -ENXIO; ret = -ENXIO;
goto out2; goto out2;
} }
bdev->bd_queue = bdev->bd_contains->bd_queue; bdev->bd_queue = bdev->bd_contains->bd_queue;
bdev->bd_offset = p->start_sect; bdev->bd_offset = p->start_sect;
bd_set_size(bdev, (loff_t) p->nr_sects << 9); bd_set_size(bdev, (loff_t) p->nr_sects << 9);
put_disk(g); bdev->bd_disk = disk;
} }
up(&bdev->bd_contains->bd_sem); up(&bdev->bd_contains->bd_sem);
} }
bdev->bd_openers++; if (bdev->bd_openers++)
put_disk(disk);
up(&bdev->bd_sem); up(&bdev->bd_sem);
unlock_kernel(); unlock_kernel();
return 0; return 0;
...@@ -712,6 +692,7 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file * ...@@ -712,6 +692,7 @@ static int do_open(struct block_device *bdev, struct inode *inode, struct file *
} }
} }
out1: out1:
put_disk(disk);
if (!old) { if (!old) {
bdev->bd_op = NULL; bdev->bd_op = NULL;
if (owner) if (owner)
...@@ -785,15 +766,18 @@ int blkdev_put(struct block_device *bdev, int kind) ...@@ -785,15 +766,18 @@ int blkdev_put(struct block_device *bdev, int kind)
up(&bdev->bd_contains->bd_sem); up(&bdev->bd_contains->bd_sem);
} }
if (!bdev->bd_openers) { if (!bdev->bd_openers) {
struct gendisk *disk = bdev->bd_disk;
if (bdev->bd_op->owner) if (bdev->bd_op->owner)
__MOD_DEC_USE_COUNT(bdev->bd_op->owner); __MOD_DEC_USE_COUNT(bdev->bd_op->owner);
bdev->bd_op = NULL; bdev->bd_op = NULL;
bdev->bd_queue = NULL; bdev->bd_queue = NULL;
bdev->bd_disk = NULL;
bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info; bdev->bd_inode->i_data.backing_dev_info = &default_backing_dev_info;
if (bdev != bdev->bd_contains) { if (bdev != bdev->bd_contains) {
blkdev_put(bdev->bd_contains, BDEV_RAW); blkdev_put(bdev->bd_contains, BDEV_RAW);
bdev->bd_contains = NULL; bdev->bd_contains = NULL;
} }
put_disk(disk);
} }
unlock_kernel(); unlock_kernel();
up(&bdev->bd_sem); up(&bdev->bd_sem);
......
include/linux/blkdev.h
View file @ 5682bcc6
...@@ -34,6 +34,7 @@ struct request { ...@@ -34,6 +34,7 @@ struct request {
int rq_status; /* should split this into a few status bits */ int rq_status; /* should split this into a few status bits */
kdev_t rq_dev; kdev_t rq_dev;
struct gendisk *rq_disk;
int errors; int errors;
sector_t sector; sector_t sector;
unsigned long nr_sectors; unsigned long nr_sectors;
......
include/linux/fs.h
View file @ 5682bcc6
...@@ -359,6 +359,7 @@ struct block_device { ...@@ -359,6 +359,7 @@ struct block_device {
sector_t bd_offset; sector_t bd_offset;
unsigned bd_part_count; unsigned bd_part_count;
int bd_invalidated; int bd_invalidated;
struct gendisk * bd_disk;
}; };
struct inode { struct inode {
......
include/linux/genhd.h
View file @ 5682bcc6
...@@ -90,6 +90,10 @@ struct gendisk { ...@@ -90,6 +90,10 @@ struct gendisk {
devfs_handle_t disk_de; /* piled higher and deeper */ devfs_handle_t disk_de; /* piled higher and deeper */
struct device *driverfs_dev; struct device *driverfs_dev;
struct device disk_dev; struct device disk_dev;
unsigned sync_io; /* RAID */
unsigned reads, writes;
unsigned rio, wio;
}; };
/* drivers/block/genhd.c */ /* drivers/block/genhd.c */
...@@ -272,15 +276,6 @@ extern void put_disk(struct gendisk *disk); ...@@ -272,15 +276,6 @@ extern void put_disk(struct gendisk *disk);
/* will go away */ /* will go away */
extern void blk_set_probe(int major, struct gendisk *(p)(int)); extern void blk_set_probe(int major, struct gendisk *(p)(int));
static inline unsigned int disk_index (kdev_t dev)
{
int part, res;
struct gendisk *g = get_gendisk(kdev_t_to_nr(dev), &part);
res = g ? (minor(dev) >> g->minor_shift) : 0;
put_disk(g);
return res;
}
#endif #endif
#endif #endif
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