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: (55 commits)
  [SCSI] tcm_loop: Add multi-fabric Linux/SCSI LLD fabric module
  [SCSI] qla4xxx: Use polling mode for disable interrupt mailbox completion
  [SCSI] Revert "[SCSI] Retrieve the Caching mode page"
  [SCSI] bnx2fc: IO completion not processed due to missed wakeup
  [SCSI] qla4xxx: Update driver version to 5.02.00-k6
  [SCSI] qla4xxx: masking required bits of add_fw_options during initialization
  [SCSI] qla4xxx: added new function qla4xxx_relogin_all_devices
  [SCSI] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param
  [SCSI] qla4xxx: Add support for ql4xmaxqdepth command line parameter
  [SCSI] qla4xxx: cleanup function qla4xxx_process_ddb_changed
  [SCSI] qla4xxx: Prevent other port reinitialization during remove_adapter
  [SCSI] qla4xxx: remove unused ddb flag DF_NO_RELOGIN
  [SCSI] qla4xxx: cleanup DDB relogin logic during initialization
  [SCSI] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed
  [SCSI] qla4xxx: Do not send mbox command if FW is in failed state
  [SCSI] qla4xxx: cleanup qla4xxx_initialize_ddb_list()
  [SCSI] ses: add subenclosure support
  [SCSI] bnx2fc: Bump version to 1.0.1
  [SCSI] bnx2fc: Remove unnecessary module state checks
  [SCSI] bnx2fc: Fix MTU issue by using static MTU
  ...

1 files changed, 17 insertions, 11 deletions

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index eb0afec046e1..86639004af9e 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -129,10 +129,11 @@ static struct se_device *iblock_create_virtdevice(
         struct request_queue *q;
         struct queue_limits *limits;
         u32 dev_flags = 0;
+        int ret = -EINVAL;
 
         if (!(ib_dev)) {
                 printk(KERN_ERR "Unable to locate struct iblock_dev parameter\n");
-                return 0;
+                return ERR_PTR(ret);
         }
         memset(&dev_limits, 0, sizeof(struct se_dev_limits));
         /*
@@ -141,7 +142,7 @@ static struct se_device *iblock_create_virtdevice(
         ib_dev->ibd_bio_set = bioset_create(32, 64);
         if (!(ib_dev->ibd_bio_set)) {
                 printk(KERN_ERR "IBLOCK: Unable to create bioset()\n");
-                return 0;
+                return ERR_PTR(-ENOMEM);
         }
         printk(KERN_INFO "IBLOCK: Created bio_set()\n");
         /*
@@ -153,8 +154,10 @@ static struct se_device *iblock_create_virtdevice(
 
         bd = blkdev_get_by_path(ib_dev->ibd_udev_path,
                                 FMODE_WRITE|FMODE_READ|FMODE_EXCL, ib_dev);
-        if (IS_ERR(bd))
+        if (IS_ERR(bd)) {
+                ret = PTR_ERR(bd);
                 goto failed;
+        }
         /*
          * Setup the local scope queue_limits from struct request_queue->limits
          * to pass into transport_add_device_to_core_hba() as struct se_dev_limits.
@@ -184,9 +187,7 @@ static struct se_device *iblock_create_virtdevice(
          * the QUEUE_FLAG_DISCARD bit for UNMAP/WRITE_SAME in SCSI + TRIM
          * in ATA and we need to set TPE=1
          */
-        if (blk_queue_discard(bdev_get_queue(bd))) {
-                struct request_queue *q = bdev_get_queue(bd);
-
+        if (blk_queue_discard(q)) {
                 DEV_ATTRIB(dev)->max_unmap_lba_count =
                                 q->limits.max_discard_sectors;
                 /*
@@ -212,7 +213,7 @@ failed:
         ib_dev->ibd_bd = NULL;
         ib_dev->ibd_major = 0;
         ib_dev->ibd_minor = 0;
-        return NULL;
+        return ERR_PTR(ret);
 }
 
 static void iblock_free_device(void *p)
@@ -467,7 +468,7 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba,
                                                const char *page, ssize_t count)
 {
         struct iblock_dev *ib_dev = se_dev->se_dev_su_ptr;
-        char *orig, *ptr, *opts;
+        char *orig, *ptr, *arg_p, *opts;
         substring_t args[MAX_OPT_ARGS];
         int ret = 0, arg, token;
 
@@ -490,9 +491,14 @@ static ssize_t iblock_set_configfs_dev_params(struct se_hba *hba,
                                 ret = -EEXIST;
                                 goto out;
                         }
-
-                        ret = snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,
-                                "%s", match_strdup(&args[0]));
+                        arg_p = match_strdup(&args[0]);
+                        if (!arg_p) {
+                                ret = -ENOMEM;
+                                break;
+                        }
+                        snprintf(ib_dev->ibd_udev_path, SE_UDEV_PATH_LEN,
+                                        "%s", arg_p);
+                        kfree(arg_p);
                         printk(KERN_INFO "IBLOCK: Referencing UDEV path: %s\n",
                                         ib_dev->ibd_udev_path);
                         ib_dev->ibd_flags |= IBDF_HAS_UDEV_PATH;