Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (204 commits)
  [SCSI] qla4xxx: export address/port of connection (fix udev disk names)
  [SCSI] ipr: Fix BUG on adapter dump timeout
  [SCSI] megaraid_sas: Fix instance access in megasas_reset_timer
  [SCSI] hpsa: change confusing message to be more clear
  [SCSI] iscsi class: fix vlan configuration
  [SCSI] qla4xxx: fix data alignment and use nl helpers
  [SCSI] iscsi class: fix link local mispelling
  [SCSI] iscsi class: Replace iscsi_get_next_target_id with IDA
  [SCSI] aacraid: use lower snprintf() limit
  [SCSI] lpfc 8.3.27: Change driver version to 8.3.27
  [SCSI] lpfc 8.3.27: T10 additions for SLI4
  [SCSI] lpfc 8.3.27: Fix queue allocation failure recovery
  [SCSI] lpfc 8.3.27: Change algorithm for getting physical port name
  [SCSI] lpfc 8.3.27: Changed worst case mailbox timeout
  [SCSI] lpfc 8.3.27: Miscellanous logic and interface fixes
  [SCSI] megaraid_sas: Changelog and version update
  [SCSI] megaraid_sas: Add driver workaround for PERC5/1068 kdump kernel panic
  [SCSI] megaraid_sas: Add multiple MSI-X vector/multiple reply queue support
  [SCSI] megaraid_sas: Add support for MegaRAID 9360/9380 12GB/s controllers
  [SCSI] megaraid_sas: Clear FUSION_IN_RESET before enabling interrupts
  ...

1 files changed, 71 insertions, 0 deletions

diff --git a/block/genhd.c b/block/genhd.c
index e2f67902dd02..94855a9717de 100644
--- 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"
 
@@ -909,6 +910,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 +1037,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 +1060,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,