Merge branch 'for-3.2/drivers' of git://git.kernel.dk/linux-block

[pandora-kernel.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 2429ecb..9253839 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -19,6 +19,7 @@
 #include <linux/mutex.h>
 #include <linux/idr.h>
 #include <linux/log2.h>
+#include <linux/ctype.h>
 
 #include "blk.h"
 
@@ -611,6 +612,12 @@ void add_disk(struct gendisk *disk)
        register_disk(disk);
        blk_register_queue(disk);
 
+       /*
+        * Take an extra ref on queue which will be put on disk_release()
+        * so that it sticks around as long as @disk is there.
+        */
+       WARN_ON_ONCE(blk_get_queue(disk->queue));
+
        retval = sysfs_create_link(&disk_to_dev(disk)->kobj, &bdi->dev->kobj,
                                   "bdi");
        WARN_ON(retval);
@@ -909,6 +916,74 @@ static int __init genhd_device_init(void)
 
 subsys_initcall(genhd_device_init);
 
+static ssize_t alias_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+       struct gendisk *disk = dev_to_disk(dev);
+       ssize_t ret = 0;
+
+       if (disk->alias)
+               ret = snprintf(buf, ALIAS_LEN, "%s\n", disk->alias);
+       return ret;
+}
+
+static ssize_t alias_store(struct device *dev, struct device_attribute *attr,
+                          const char *buf, size_t count)
+{
+       struct gendisk *disk = dev_to_disk(dev);
+       char *alias;
+       char *envp[] = { NULL, NULL };
+       unsigned char c;
+       int i;
+       ssize_t ret = count;
+
+       if (!count)
+               return -EINVAL;
+
+       if (count >= ALIAS_LEN) {
+               printk(KERN_ERR "alias: alias is too long\n");
+               return -EINVAL;
+       }
+
+       /* Validation check */
+       for (i = 0; i < count; i++) {
+               c = buf[i];
+               if (i == count - 1 && c == '\n')
+                       break;
+               if (!isalnum(c) && c != '_' && c != '-') {
+                       printk(KERN_ERR "alias: invalid alias\n");
+                       return -EINVAL;
+               }
+       }
+
+       if (disk->alias) {
+               printk(KERN_INFO "alias: %s is already assigned (%s)\n",
+                      disk->disk_name, disk->alias);
+               return -EINVAL;
+       }
+
+       alias = kasprintf(GFP_KERNEL, "%s", buf);
+       if (!alias)
+               return -ENOMEM;
+
+       if (alias[count - 1] == '\n')
+               alias[count - 1] = '\0';
+
+       envp[0] = kasprintf(GFP_KERNEL, "ALIAS=%s", alias);
+       if (!envp[0]) {
+               kfree(alias);
+               return -ENOMEM;
+       }
+
+       disk->alias = alias;
+       printk(KERN_INFO "alias: assigned %s to %s\n", alias, disk->disk_name);
+
+       kobject_uevent_env(&dev->kobj, KOBJ_ADD, envp);
+
+       kfree(envp[0]);
+       return ret;
+}
+
 static ssize_t disk_range_show(struct device *dev,
                               struct device_attribute *attr, char *buf)
 {
@@ -968,6 +1043,7 @@ static ssize_t disk_discard_alignment_show(struct device *dev,
        return sprintf(buf, "%d\n", queue_discard_alignment(disk->queue));
 }
 
+static DEVICE_ATTR(alias, S_IRUGO|S_IWUSR, alias_show, alias_store);
 static DEVICE_ATTR(range, S_IRUGO, disk_range_show, NULL);
 static DEVICE_ATTR(ext_range, S_IRUGO, disk_ext_range_show, NULL);
 static DEVICE_ATTR(removable, S_IRUGO, disk_removable_show, NULL);
@@ -990,6 +1066,7 @@ static struct device_attribute dev_attr_fail_timeout =
 #endif
 
 static struct attribute *disk_attrs[] = {
+       &dev_attr_alias.attr,
        &dev_attr_range.attr,
        &dev_attr_ext_range.attr,
        &dev_attr_removable.attr,
@@ -1095,6 +1172,8 @@ static void disk_release(struct device *dev)
        disk_replace_part_tbl(disk, NULL);
        free_part_stats(&disk->part0);
        free_part_info(&disk->part0);
+       if (disk->queue)
+               blk_put_queue(disk->queue);
        kfree(disk);
 }
 struct class block_class = {
@@ -1146,17 +1225,17 @@ static int diskstats_show(struct seq_file *seqf, void *v)
                cpu = part_stat_lock();
                part_round_stats(cpu, hd);
                part_stat_unlock();
-               seq_printf(seqf, "%4d %7d %s %lu %lu %llu "
-                          "%u %lu %lu %llu %u %u %u %u\n",
+               seq_printf(seqf, "%4d %7d %s %lu %lu %lu "
+                          "%u %lu %lu %lu %u %u %u %u\n",
                           MAJOR(part_devt(hd)), MINOR(part_devt(hd)),
                           disk_name(gp, hd->partno, buf),
                           part_stat_read(hd, ios[READ]),
                           part_stat_read(hd, merges[READ]),
-                          (unsigned long long)part_stat_read(hd, sectors[READ]),
+                          part_stat_read(hd, sectors[READ]),
                           jiffies_to_msecs(part_stat_read(hd, ticks[READ])),
                           part_stat_read(hd, ios[WRITE]),
                           part_stat_read(hd, merges[WRITE]),
-                          (unsigned long long)part_stat_read(hd, sectors[WRITE]),
+                          part_stat_read(hd, sectors[WRITE]),
                           jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
                           part_in_flight(hd),
                           jiffies_to_msecs(part_stat_read(hd, io_ticks)),