Driver core: convert block from raw kobjects to core devices (edfaa7c3) · Commits · 戴 / test

block/genhd.c

+183 −233

Original line number	Diff line number	Diff line
		@@ -17,9 +17,10 @@
		#include <linux/buffer_head.h>
		#include <linux/mutex.h>

		struct kset *block_kset;
		static struct kset_uevent_ops block_uevent_ops;
		static DEFINE_MUTEX(block_subsys_lock);
		static DEFINE_MUTEX(block_class_lock);
		#ifndef CONFIG_SYSFS_DEPRECATED
		struct kobject *block_depr;
		#endif

		/*
		* Can be deleted altogether. Later.
		@@ -38,19 +39,17 @@ static inline int major_to_index(int major)
		}

		#ifdef CONFIG_PROC_FS

		void blkdev_show(struct seq_file *f, off_t offset)
		{
		struct blk_major_name *dp;

		if (offset < BLKDEV_MAJOR_HASH_SIZE) {
		mutex_lock(&block_subsys_lock);
		mutex_lock(&block_class_lock);
		for (dp = major_names[offset]; dp; dp = dp->next)
		seq_printf(f, "%3d %s\n", dp->major, dp->name);
		mutex_unlock(&block_subsys_lock);
		mutex_unlock(&block_class_lock);
		}
		}

		#endif /* CONFIG_PROC_FS */

		int register_blkdev(unsigned int major, const char *name)
		@@ -58,7 +57,7 @@ int register_blkdev(unsigned int major, const char *name)
		struct blk_major_name *n, p;
		int index, ret = 0;

		mutex_lock(&block_subsys_lock);
		mutex_lock(&block_class_lock);

		/* temporary */
		if (major == 0) {
		@@ -103,7 +102,7 @@ int register_blkdev(unsigned int major, const char *name)
		kfree(p);
		}
		out:
		mutex_unlock(&block_subsys_lock);
		mutex_unlock(&block_class_lock);
		return ret;
		}

		@@ -115,7 +114,7 @@ void unregister_blkdev(unsigned int major, const char *name)
		struct blk_major_name *p = NULL;
		int index = major_to_index(major);

		mutex_lock(&block_subsys_lock);
		mutex_lock(&block_class_lock);
		for (n = &major_names[index]; n; n = &(n)->next)
		if ((*n)->major == major)
		break;
		@@ -125,7 +124,7 @@ void unregister_blkdev(unsigned int major, const char *name)
		p = *n;
		*n = p->next;
		}
		mutex_unlock(&block_subsys_lock);
		mutex_unlock(&block_class_lock);
		kfree(p);
		}

		@@ -138,29 +137,30 @@ static struct kobj_map *bdev_map;
		* range must be nonzero
		* The hash chain is sorted on range, so that subranges can override.
		*/
		void blk_register_region(dev_t dev, unsigned long range, struct module *module,
		void blk_register_region(dev_t devt, unsigned long range, struct module *module,
		struct kobject (probe)(dev_t, int , void ),
		int (lock)(dev_t, void ), void *data)
		{
		kobj_map(bdev_map, dev, range, module, probe, lock, data);
		kobj_map(bdev_map, devt, range, module, probe, lock, data);
		}

		EXPORT_SYMBOL(blk_register_region);

		void blk_unregister_region(dev_t dev, unsigned long range)
		void blk_unregister_region(dev_t devt, unsigned long range)
		{
		kobj_unmap(bdev_map, dev, range);
		kobj_unmap(bdev_map, devt, range);
		}

		EXPORT_SYMBOL(blk_unregister_region);

		static struct kobject exact_match(dev_t dev, int part, void *data)
		static struct kobject exact_match(dev_t devt, int part, void *data)
		{
		struct gendisk *p = data;
		return &p->kobj;

		return &p->dev.kobj;
		}

		static int exact_lock(dev_t dev, void *data)
		static int exact_lock(dev_t devt, void *data)
		{
		struct gendisk *p = data;

		@@ -195,8 +195,6 @@ void unlink_gendisk(struct gendisk *disk)
		disk->minors);
		}

		#define to_disk(obj) container_of(obj,struct gendisk,kobj)

		/**
		* get_gendisk - get partitioning information for a given device
		* @dev: device to get partitioning information for
		@@ -204,10 +202,12 @@ void unlink_gendisk(struct gendisk *disk)
		* This function gets the structure containing partitioning
		* information for the given device @dev.
		*/
		struct gendisk get_gendisk(dev_t dev, int part)
		struct gendisk get_gendisk(dev_t devt, int part)
		{
		struct kobject *kobj = kobj_lookup(bdev_map, dev, part);
		return kobj ? to_disk(kobj) : NULL;
		struct kobject *kobj = kobj_lookup(bdev_map, devt, part);
		struct device *dev = kobj_to_dev(kobj);

		return kobj ? dev_to_disk(dev) : NULL;
		}

		/*
		@@ -217,13 +217,17 @@ struct gendisk get_gendisk(dev_t dev, int part)
		*/
		void __init printk_all_partitions(void)
		{
		int n;
		struct device *dev;
		struct gendisk *sgp;
		char buf[BDEVNAME_SIZE];
		int n;

		mutex_lock(&block_subsys_lock);
		mutex_lock(&block_class_lock);
		/* For each block device... */
		list_for_each_entry(sgp, &block_kset->list, kobj.entry) {
		char buf[BDEVNAME_SIZE];
		list_for_each_entry(dev, &block_class.devices, node) {
		if (dev->type != &disk_type)
		continue;
		sgp = dev_to_disk(dev);
		/*
		* Don't show empty devices or things that have been surpressed
		*/
		@@ -256,38 +260,46 @@ void __init printk_all_partitions(void)
		sgp->major, n + 1 + sgp->first_minor,
		(unsigned long long)sgp->part[n]->nr_sects >> 1,
		disk_name(sgp, n + 1, buf));
		} /* partition subloop */
		} /* Block device loop */
		}
		}

		mutex_unlock(&block_subsys_lock);
		return;
		mutex_unlock(&block_class_lock);
		}

		#ifdef CONFIG_PROC_FS
		/* iterator */
		static void part_start(struct seq_file part, loff_t *pos)
		{
		struct list_head *p;
		loff_t l = *pos;
		loff_t k = *pos;
		struct device *dev;

		mutex_lock(&block_subsys_lock);
		list_for_each(p, &block_kset->list)
		if (!l--)
		return list_entry(p, struct gendisk, kobj.entry);
		mutex_lock(&block_class_lock);
		list_for_each_entry(dev, &block_class.devices, node) {
		if (dev->type != &disk_type)
		continue;
		if (!k--)
		return dev_to_disk(dev);
		}
		return NULL;
		}

		static void part_next(struct seq_file part, void v, loff_t pos)
		{
		struct list_head p = ((struct gendisk )v)->kobj.entry.next;
		struct gendisk *gp = v;
		struct device *dev;
		++*pos;
		return p==&block_kset->list ? NULL :
		list_entry(p, struct gendisk, kobj.entry);
		list_for_each_entry(dev, &gp->dev.node, node) {
		if (&dev->node == &block_class.devices)
		return NULL;
		if (dev->type == &disk_type)
		return dev_to_disk(dev);
		}
		return NULL;
		}

		static void part_stop(struct seq_file part, void v)
		{
		mutex_unlock(&block_subsys_lock);
		mutex_unlock(&block_class_lock);
		}

		static int show_partition(struct seq_file part, void v)
		@@ -296,7 +308,7 @@ static int show_partition(struct seq_file part, void v)
		int n;
		char buf[BDEVNAME_SIZE];

		if (&sgp->kobj.entry == block_kset->list.next)
		if (&sgp->dev.node == block_class.devices.next)
		seq_puts(part, "major minor #blocks name\n\n");

		/* Don't show non-partitionable removeable devices or empty devices */
		@@ -336,99 +348,71 @@ struct seq_operations partitions_op = {

		extern int blk_dev_init(void);

		static struct kobject base_probe(dev_t dev, int part, void *data)
		static struct kobject base_probe(dev_t devt, int part, void *data)
		{
		if (request_module("block-major-%d-%d", MAJOR(dev), MINOR(dev)) > 0)
		if (request_module("block-major-%d-%d", MAJOR(devt), MINOR(devt)) > 0)
		/* Make old-style 2.4 aliases work */
		request_module("block-major-%d", MAJOR(dev));
		request_module("block-major-%d", MAJOR(devt));
		return NULL;
		}

		static int __init genhd_device_init(void)
		{
		bdev_map = kobj_map_init(base_probe, &block_subsys_lock);
		class_register(&block_class);
		bdev_map = kobj_map_init(base_probe, &block_class_lock);
		blk_dev_init();
		block_kset = kset_create_and_add("block", &block_uevent_ops, NULL);
		if (!block_kset) {
		printk(KERN_WARNING "%s: kset_create error\n", __FUNCTION__);
		return -ENOMEM;
		}

		#ifndef CONFIG_SYSFS_DEPRECATED
		/* create top-level block dir */
		block_depr = kobject_create_and_add("block", NULL);
		#endif
		return 0;
		}

		subsys_initcall(genhd_device_init);



		/*
		* kobject & sysfs bindings for block devices
		*/
		static ssize_t disk_attr_show(struct kobject kobj, struct attribute attr,
		char *page)
		static ssize_t disk_range_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct gendisk *disk = to_disk(kobj);
		struct disk_attribute *disk_attr =
		container_of(attr,struct disk_attribute,attr);
		ssize_t ret = -EIO;
		struct gendisk *disk = dev_to_disk(dev);

		if (disk_attr->show)
		ret = disk_attr->show(disk,page);
		return ret;
		return sprintf(buf, "%d\n", disk->minors);
		}

		static ssize_t disk_attr_store(struct kobject * kobj, struct attribute * attr,
		const char *page, size_t count)
		static ssize_t disk_removable_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct gendisk *disk = to_disk(kobj);
		struct disk_attribute *disk_attr =
		container_of(attr,struct disk_attribute,attr);
		ssize_t ret = 0;
		struct gendisk *disk = dev_to_disk(dev);

		if (disk_attr->store)
		ret = disk_attr->store(disk, page, count);
		return ret;
		return sprintf(buf, "%d\n",
		(disk->flags & GENHD_FL_REMOVABLE ? 1 : 0));
		}

		static struct sysfs_ops disk_sysfs_ops = {
		.show = &disk_attr_show,
		.store = &disk_attr_store,
		};

		static ssize_t disk_uevent_store(struct gendisk * disk,
		const char *buf, size_t count)
		{
		kobject_uevent(&disk->kobj, KOBJ_ADD);
		return count;
		}
		static ssize_t disk_dev_read(struct gendisk * disk, char *page)
		{
		dev_t base = MKDEV(disk->major, disk->first_minor);
		return print_dev_t(page, base);
		}
		static ssize_t disk_range_read(struct gendisk * disk, char *page)
		{
		return sprintf(page, "%d\n", disk->minors);
		}
		static ssize_t disk_removable_read(struct gendisk * disk, char *page)
		static ssize_t disk_size_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		return sprintf(page, "%d\n",
		(disk->flags & GENHD_FL_REMOVABLE ? 1 : 0));
		struct gendisk *disk = dev_to_disk(dev);

		return sprintf(buf, "%llu\n", (unsigned long long)get_capacity(disk));
		}
		static ssize_t disk_size_read(struct gendisk * disk, char *page)
		{
		return sprintf(page, "%llu\n", (unsigned long long)get_capacity(disk));
		}
		static ssize_t disk_capability_read(struct gendisk disk, char page)

		static ssize_t disk_capability_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		return sprintf(page, "%x\n", disk->flags);
		struct gendisk *disk = dev_to_disk(dev);

		return sprintf(buf, "%x\n", disk->flags);
		}
		static ssize_t disk_stats_read(struct gendisk * disk, char *page)

		static ssize_t disk_stat_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct gendisk *disk = dev_to_disk(dev);

		preempt_disable();
		disk_round_stats(disk);
		preempt_enable();
		return sprintf(page,
		return sprintf(buf,
		"%8lu %8lu %8llu %8u "
		"%8lu %8lu %8llu %8u "
		"%8u %8u %8u"
		@@ -445,40 +429,21 @@ static ssize_t disk_stats_read(struct gendisk * disk, char *page)
		jiffies_to_msecs(disk_stat_read(disk, io_ticks)),
		jiffies_to_msecs(disk_stat_read(disk, time_in_queue)));
		}
		static struct disk_attribute disk_attr_uevent = {
		.attr = {.name = "uevent", .mode = S_IWUSR },
		.store = disk_uevent_store
		};
		static struct disk_attribute disk_attr_dev = {
		.attr = {.name = "dev", .mode = S_IRUGO },
		.show = disk_dev_read
		};
		static struct disk_attribute disk_attr_range = {
		.attr = {.name = "range", .mode = S_IRUGO },
		.show = disk_range_read
		};
		static struct disk_attribute disk_attr_removable = {
		.attr = {.name = "removable", .mode = S_IRUGO },
		.show = disk_removable_read
		};
		static struct disk_attribute disk_attr_size = {
		.attr = {.name = "size", .mode = S_IRUGO },
		.show = disk_size_read
		};
		static struct disk_attribute disk_attr_capability = {
		.attr = {.name = "capability", .mode = S_IRUGO },
		.show = disk_capability_read
		};
		static struct disk_attribute disk_attr_stat = {
		.attr = {.name = "stat", .mode = S_IRUGO },
		.show = disk_stats_read
		};

		#ifdef CONFIG_FAIL_MAKE_REQUEST
		static ssize_t disk_fail_show(struct device *dev,
		struct device_attribute attr, char buf)
		{
		struct gendisk *disk = dev_to_disk(dev);

		return sprintf(buf, "%d\n", disk->flags & GENHD_FL_FAIL ? 1 : 0);
		}

		static ssize_t disk_fail_store(struct gendisk * disk,
		static ssize_t disk_fail_store(struct device *dev,
		struct device_attribute *attr,
		const char *buf, size_t count)
		{
		struct gendisk *disk = dev_to_disk(dev);
		int i;

		if (count > 0 && sscanf(buf, "%d", &i) > 0) {
		@@ -490,134 +455,100 @@ static ssize_t disk_fail_store(struct gendisk * disk,

		return count;
		}
		static ssize_t disk_fail_read(struct gendisk * disk, char *page)
		{
		return sprintf(page, "%d\n", disk->flags & GENHD_FL_FAIL ? 1 : 0);
		}
		static struct disk_attribute disk_attr_fail = {
		.attr = {.name = "make-it-fail", .mode = S_IRUGO \| S_IWUSR },
		.store = disk_fail_store,
		.show = disk_fail_read
		};

		#endif

		static struct attribute * default_attrs[] = {
		&disk_attr_uevent.attr,
		&disk_attr_dev.attr,
		&disk_attr_range.attr,
		&disk_attr_removable.attr,
		&disk_attr_size.attr,
		&disk_attr_stat.attr,
		&disk_attr_capability.attr,
		static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL);
		static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL);
		static DEVICE_ATTR(size, S_IRUGO, disk_size_show, NULL);
		static DEVICE_ATTR(capability, S_IRUGO, disk_capability_show, NULL);
		static DEVICE_ATTR(stat, S_IRUGO, disk_stat_show, NULL);
		#ifdef CONFIG_FAIL_MAKE_REQUEST
		&disk_attr_fail.attr,
		static struct device_attribute dev_attr_fail =
		__ATTR(make-it-fail, S_IRUGO\|S_IWUSR, disk_fail_show, disk_fail_store);
		#endif
		NULL,

		static struct attribute *disk_attrs[] = {
		&dev_attr_range.attr,
		&dev_attr_removable.attr,
		&dev_attr_size.attr,
		&dev_attr_capability.attr,
		&dev_attr_stat.attr,
		#ifdef CONFIG_FAIL_MAKE_REQUEST
		&dev_attr_fail.attr,
		#endif
		NULL
		};

		static struct attribute_group disk_attr_group = {
		.attrs = disk_attrs,
		};

		static struct attribute_group *disk_attr_groups[] = {
		&disk_attr_group,
		NULL
		};

		static void disk_release(struct kobject * kobj)
		static void disk_release(struct device *dev)
		{
		struct gendisk *disk = to_disk(kobj);
		struct gendisk *disk = dev_to_disk(dev);

		kfree(disk->random);
		kfree(disk->part);
		free_disk_stats(disk);
		kfree(disk);
		}

		static struct kobj_type ktype_block = {
		.release = disk_release,
		.sysfs_ops = &disk_sysfs_ops,
		.default_attrs = default_attrs,
		struct class block_class = {
		.name = "block",
		};

		extern struct kobj_type ktype_part;

		static int block_uevent_filter(struct kset kset, struct kobject kobj)
		{
		struct kobj_type *ktype = get_ktype(kobj);

		return ((ktype == &ktype_block) \|\| (ktype == &ktype_part));
		}

		static int block_uevent(struct kset kset, struct kobject kobj,
		struct kobj_uevent_env *env)
		{
		struct kobj_type *ktype = get_ktype(kobj);
		struct device *physdev;
		struct gendisk *disk;
		struct hd_struct *part;

		if (ktype == &ktype_block) {
		disk = container_of(kobj, struct gendisk, kobj);
		add_uevent_var(env, "MINOR=%u", disk->first_minor);
		} else if (ktype == &ktype_part) {
		disk = container_of(kobj->parent, struct gendisk, kobj);
		part = container_of(kobj, struct hd_struct, kobj);
		add_uevent_var(env, "MINOR=%u",
		disk->first_minor + part->partno);
		} else
		return 0;

		add_uevent_var(env, "MAJOR=%u", disk->major);

		/* add physical device, backing this device */
		physdev = disk->driverfs_dev;
		if (physdev) {
		char *path = kobject_get_path(&physdev->kobj, GFP_KERNEL);

		add_uevent_var(env, "PHYSDEVPATH=%s", path);
		kfree(path);

		if (physdev->bus)
		add_uevent_var(env, "PHYSDEVBUS=%s", physdev->bus->name);

		if (physdev->driver)
		add_uevent_var(env, physdev->driver->name);
		}

		return 0;
		}

		static struct kset_uevent_ops block_uevent_ops = {
		.filter = block_uevent_filter,
		.uevent = block_uevent,
		struct device_type disk_type = {
		.name = "disk",
		.groups = disk_attr_groups,
		.release = disk_release,
		};

		/*
		* aggregate disk stat collector. Uses the same stats that the sysfs
		* entries do, above, but makes them available through one seq_file.
		* Watching a few disks may be efficient through sysfs, but watching
		* all of them will be more efficient through this interface.
		*
		* The output looks suspiciously like /proc/partitions with a bunch of
		* extra fields.
		*/

		/* iterator */
		static void diskstats_start(struct seq_file part, loff_t *pos)
		{
		loff_t k = *pos;
		struct list_head *p;
		struct device *dev;

		mutex_lock(&block_subsys_lock);
		list_for_each(p, &block_kset->list)
		mutex_lock(&block_class_lock);
		list_for_each_entry(dev, &block_class.devices, node) {
		if (dev->type != &disk_type)
		continue;
		if (!k--)
		return list_entry(p, struct gendisk, kobj.entry);
		return dev_to_disk(dev);
		}
		return NULL;
		}

		static void diskstats_next(struct seq_file part, void v, loff_t pos)
		{
		struct list_head p = ((struct gendisk )v)->kobj.entry.next;
		struct gendisk *gp = v;
		struct device *dev;

		++*pos;
		return p==&block_kset->list ? NULL :
		list_entry(p, struct gendisk, kobj.entry);
		list_for_each_entry(dev, &gp->dev.node, node) {
		if (&dev->node == &block_class.devices)
		return NULL;
		if (dev->type == &disk_type)
		return dev_to_disk(dev);
		}
		return NULL;
		}

		static void diskstats_stop(struct seq_file part, void v)
		{
		mutex_unlock(&block_subsys_lock);
		mutex_unlock(&block_class_lock);
		}

		static int diskstats_show(struct seq_file s, void v)
		@@ -627,7 +558,7 @@ static int diskstats_show(struct seq_file s, void v)
		int n = 0;

		/*
		if (&sgp->kobj.entry == block_kset->list.next)
		if (&gp->dev.kobj.entry == block_class.devices.next)
		seq_puts(s, "major minor name"
		" rio rmerge rsect ruse wio wmerge "
		"wsect wuse running use aveq"
		@@ -681,7 +612,7 @@ static void media_change_notify_thread(struct work_struct *work)
		* set enviroment vars to indicate which event this is for
		* so that user space will know to go check the media status.
		*/
		kobject_uevent_env(&gd->kobj, KOBJ_CHANGE, envp);
		kobject_uevent_env(&gd->dev.kobj, KOBJ_CHANGE, envp);
		put_device(gd->driverfs_dev);
		}

		@@ -692,6 +623,25 @@ void genhd_media_change_notify(struct gendisk *disk)
		}
		EXPORT_SYMBOL_GPL(genhd_media_change_notify);

		dev_t blk_lookup_devt(const char *name)
		{
		struct device *dev;
		dev_t devt = MKDEV(0, 0);

		mutex_lock(&block_class_lock);
		list_for_each_entry(dev, &block_class.devices, node) {
		if (strcmp(dev->bus_id, name) == 0) {
		devt = dev->devt;
		break;
		}
		}
		mutex_unlock(&block_class_lock);

		return devt;
		}

		EXPORT_SYMBOL(blk_lookup_devt);

		struct gendisk *alloc_disk(int minors)
		{
		return alloc_disk_node(minors, -1);
		@@ -719,10 +669,10 @@ struct gendisk *alloc_disk_node(int minors, int node_id)
		}
		}
		disk->minors = minors;
		disk->kobj.kset = block_kset;
		disk->kobj.ktype = &ktype_block;
		kobject_init(&disk->kobj);
		rand_initialize_disk(disk);
		disk->dev.class = &block_class;
		disk->dev.type = &disk_type;
		device_initialize(&disk->dev);
		INIT_WORK(&disk->async_notify,
		media_change_notify_thread);
		}
		@@ -742,7 +692,7 @@ struct kobject get_disk(struct gendisk disk)
		owner = disk->fops->owner;
		if (owner && !try_module_get(owner))
		return NULL;
		kobj = kobject_get(&disk->kobj);
		kobj = kobject_get(&disk->dev.kobj);
		if (kobj == NULL) {
		module_put(owner);
		return NULL;
		@@ -756,7 +706,7 @@ EXPORT_SYMBOL(get_disk);
		void put_disk(struct gendisk *disk)
		{
		if (disk)
		kobject_put(&disk->kobj);
		kobject_put(&disk->dev.kobj);
		}

		EXPORT_SYMBOL(put_disk);

block/ll_rw_blk.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4182,7 +4182,7 @@ int blk_register_queue(struct gendisk *disk)
		if (!q \|\| !q->request_fn)
		return -ENXIO;

		q->kobj.parent = kobject_get(&disk->kobj);
		q->kobj.parent = kobject_get(&disk->dev.kobj);

		ret = kobject_add(&q->kobj);
		if (ret < 0)
		@@ -4209,6 +4209,6 @@ void blk_unregister_queue(struct gendisk *disk)

		kobject_uevent(&q->kobj, KOBJ_REMOVE);
		kobject_del(&q->kobj);
		kobject_put(&disk->kobj);
		kobject_put(&disk->dev.kobj);
		}
		}

drivers/base/class.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		#include <linux/kdev_t.h>
		#include <linux/err.h>
		#include <linux/slab.h>
		#include <linux/genhd.h>
		#include "base.h"

		#define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
		@@ -149,7 +150,13 @@ int class_register(struct class * cls)
		if (error)
		return error;

		#ifdef CONFIG_SYSFS_DEPRECATED
		/* let the block class directory show up in the root of sysfs */
		if (cls != &block_class)
		cls->subsys.kobj.kset = class_kset;
		#else
		cls->subsys.kobj.kset = class_kset;
		#endif
		cls->subsys.kobj.ktype = &class_ktype;

		error = kset_register(&cls->subsys);

drivers/base/core.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -671,14 +671,15 @@ static int device_add_class_symlinks(struct device *dev)

		#ifdef CONFIG_SYSFS_DEPRECATED
		/* stacked class devices need a symlink in the class directory */
		if (dev->kobj.parent != &dev->class->subsys.kobj) {
		if (dev->kobj.parent != &dev->class->subsys.kobj &&
		dev->type != &part_type) {
		error = sysfs_create_link(&dev->class->subsys.kobj, &dev->kobj,
		dev->bus_id);
		if (error)
		goto out_subsys;
		}

		if (dev->parent) {
		if (dev->parent && dev->type != &part_type) {
		struct device *parent = dev->parent;
		char *class_name;

		@@ -707,10 +708,11 @@ static int device_add_class_symlinks(struct device *dev)
		return 0;

		out_device:
		if (dev->parent)
		if (dev->parent && dev->type != &part_type)
		sysfs_remove_link(&dev->kobj, "device");
		out_busid:
		if (dev->kobj.parent != &dev->class->subsys.kobj)
		if (dev->kobj.parent != &dev->class->subsys.kobj &&
		dev->type != &part_type)
		sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
		#else
		/* link in the class directory pointing to the device */
		@@ -719,7 +721,7 @@ out_busid:
		if (error)
		goto out_subsys;

		if (dev->parent) {
		if (dev->parent && dev->type != &part_type) {
		error = sysfs_create_link(&dev->kobj, &dev->parent->kobj,
		"device");
		if (error)
		@@ -743,7 +745,7 @@ static void device_remove_class_symlinks(struct device *dev)
		return;

		#ifdef CONFIG_SYSFS_DEPRECATED
		if (dev->parent) {
		if (dev->parent && dev->type != &part_type) {
		char *class_name;

		class_name = make_class_name(dev->class->name, &dev->kobj);
		@@ -754,10 +756,11 @@ static void device_remove_class_symlinks(struct device *dev)
		sysfs_remove_link(&dev->kobj, "device");
		}

		if (dev->kobj.parent != &dev->class->subsys.kobj)
		if (dev->kobj.parent != &dev->class->subsys.kobj &&
		dev->type != &part_type)
		sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
		#else
		if (dev->parent)
		if (dev->parent && dev->type != &part_type)
		sysfs_remove_link(&dev->kobj, "device");

		sysfs_remove_link(&dev->class->subsys.kobj, dev->bus_id);
		@@ -925,6 +928,7 @@ struct device * get_device(struct device * dev)
		*/
		void put_device(struct device * dev)
		{
		/* might_sleep(); */
		if (dev)
		kobject_put(&dev->kobj);
		}

drivers/block/aoe/aoeblk.c

+25 −26

Original line number	Diff line number	Diff line
		@@ -15,8 +15,10 @@

		static struct kmem_cache *buf_pool_cache;

		static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
		static ssize_t aoedisk_show_state(struct device *dev,
		struct device_attribute attr, char page)
		{
		struct gendisk *disk = dev_to_disk(dev);
		struct aoedev *d = disk->private_data;

		return snprintf(page, PAGE_SIZE,
		@@ -26,50 +28,47 @@ static ssize_t aoedisk_show_state(struct gendisk * disk, char *page)
		(d->nopen && !(d->flags & DEVFL_UP)) ? ",closewait" : "");
		/* I'd rather see nopen exported so we can ditch closewait */
		}
		static ssize_t aoedisk_show_mac(struct gendisk * disk, char *page)
		static ssize_t aoedisk_show_mac(struct device *dev,
		struct device_attribute attr, char page)
		{
		struct gendisk *disk = dev_to_disk(dev);
		struct aoedev *d = disk->private_data;

		return snprintf(page, PAGE_SIZE, "%012llx\n",
		(unsigned long long)mac_addr(d->addr));
		}
		static ssize_t aoedisk_show_netif(struct gendisk * disk, char *page)
		static ssize_t aoedisk_show_netif(struct device *dev,
		struct device_attribute attr, char page)
		{
		struct gendisk *disk = dev_to_disk(dev);
		struct aoedev *d = disk->private_data;

		return snprintf(page, PAGE_SIZE, "%s\n", d->ifp->name);
		}
		/* firmware version */
		static ssize_t aoedisk_show_fwver(struct gendisk * disk, char *page)
		static ssize_t aoedisk_show_fwver(struct device *dev,
		struct device_attribute attr, char page)
		{
		struct gendisk *disk = dev_to_disk(dev);
		struct aoedev *d = disk->private_data;

		return snprintf(page, PAGE_SIZE, "0x%04x\n", (unsigned int) d->fw_ver);
		}

		static struct disk_attribute disk_attr_state = {
		.attr = {.name = "state", .mode = S_IRUGO },
		.show = aoedisk_show_state
		};
		static struct disk_attribute disk_attr_mac = {
		.attr = {.name = "mac", .mode = S_IRUGO },
		.show = aoedisk_show_mac
		};
		static struct disk_attribute disk_attr_netif = {
		.attr = {.name = "netif", .mode = S_IRUGO },
		.show = aoedisk_show_netif
		};
		static struct disk_attribute disk_attr_fwver = {
		.attr = {.name = "firmware-version", .mode = S_IRUGO },
		.show = aoedisk_show_fwver
		static DEVICE_ATTR(state, S_IRUGO, aoedisk_show_state, NULL);
		static DEVICE_ATTR(mac, S_IRUGO, aoedisk_show_mac, NULL);
		static DEVICE_ATTR(netif, S_IRUGO, aoedisk_show_netif, NULL);
		static struct device_attribute dev_attr_firmware_version = {
		.attr = { .name = "firmware-version", .mode = S_IRUGO, .owner = THIS_MODULE },
		.show = aoedisk_show_fwver,
		};

		static struct attribute *aoe_attrs[] = {
		&disk_attr_state.attr,
		&disk_attr_mac.attr,
		&disk_attr_netif.attr,
		&disk_attr_fwver.attr,
		NULL
		&dev_attr_state.attr,
		&dev_attr_mac.attr,
		&dev_attr_netif.attr,
		&dev_attr_firmware_version.attr,
		NULL,
		};

		static const struct attribute_group attr_group = {
		@@ -79,12 +78,12 @@ static const struct attribute_group attr_group = {
		static int
		aoedisk_add_sysfs(struct aoedev *d)
		{
		return sysfs_create_group(&d->gd->kobj, &attr_group);
		return sysfs_create_group(&d->gd->dev.kobj, &attr_group);
		}
		void
		aoedisk_rm_sysfs(struct aoedev *d)
		{
		sysfs_remove_group(&d->gd->kobj, &attr_group);
		sysfs_remove_group(&d->gd->dev.kobj, &attr_group);
		}

		static int

Admin message