diff options
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-sysfs.c | 7 | ||||
| -rw-r--r-- | block/genhd.c | 17 |
2 files changed, 6 insertions, 18 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index d3aa2aadb3e0..b78c9c3e2670 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -40,7 +40,12 @@ queue_requests_store(struct request_queue *q, const char *page, size_t count) { struct request_list *rl = &q->rq; unsigned long nr; - int ret = queue_var_store(&nr, page, count); + int ret; + + if (!q->request_fn) + return -EINVAL; + + ret = queue_var_store(&nr, page, count); if (nr < BLKDEV_MIN_RQ) nr = BLKDEV_MIN_RQ; diff --git a/block/genhd.c b/block/genhd.c index c0c7f38c7012..f4c64c2b303a 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -992,22 +992,6 @@ static void disk_release(struct device *dev) free_part_stats(&disk->part0); kfree(disk); } - -static int disk_uevent(struct device *dev, struct kobj_uevent_env *env) -{ - struct gendisk *disk = dev_to_disk(dev); - struct disk_part_iter piter; - struct hd_struct *part; - int cnt = 0; - - disk_part_iter_init(&piter, disk, 0); - while((part = disk_part_iter_next(&piter))) - cnt++; - disk_part_iter_exit(&piter); - add_uevent_var(env, "NPARTS=%u", cnt); - return 0; -} - struct class block_class = { .name = "block", }; @@ -1026,7 +1010,6 @@ static struct device_type disk_type = { .groups = disk_attr_groups, .release = disk_release, .nodename = block_nodename, - .uevent = disk_uevent, }; #ifdef CONFIG_PROC_FS |