Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull more SCSI updates from James Bottomley:
 "This is the final round of mostly small fixes and performance
  improvements to our initial submit.

  The main regression fix is the ia64 simscsi build failure which was
  missed in the serial number elimination conversion"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (24 commits)
  scsi: ia64: simscsi: use request tag instead of serial_number
  scsi: aacraid: Fix performance issue on logical drives
  scsi: lpfc: Fix error codes in lpfc_sli4_pci_mem_setup()
  scsi: libiscsi: Hold back_lock when calling iscsi_complete_task
  scsi: hisi_sas: Change SERDES_CFG init value to increase reliability of HiLink
  scsi: hisi_sas: Send HARD RESET to clear the previous affiliation of STP target port
  scsi: hisi_sas: Set PHY linkrate when disconnected
  scsi: hisi_sas: print PHY RX errors count for later revision of v3 hw
  scsi: hisi_sas: Fix a timeout race of driver internal and SMP IO
  scsi: hisi_sas: Change return variable type in phy_up_v3_hw()
  scsi: qla2xxx: check for kstrtol() failure
  scsi: lpfc: fix 32-bit format string warning
  scsi: lpfc: fix unused variable warning
  scsi: target: tcmu: Switch to bitmap_zalloc()
  scsi: libiscsi: fall back to sendmsg for slab pages
  scsi: qla2xxx: avoid printf format warning
  scsi: lpfc: resolve static checker warning in lpfc_sli4_hba_unset
  scsi: lpfc: Correct __lpfc_sli_issue_iocb_s4 lockdep check
  scsi: ufs: hisi: fix ufs_hba_variant_ops passing
  scsi: qla2xxx: Fix panic in qla_dfs_tgt_counters_show
  ...

1 files changed, 9 insertions, 10 deletions

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 5831e0eecea1..9704b135a7bc 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1663,7 +1663,7 @@ static void tcmu_dev_kref_release(struct kref *kref)
         WARN_ON(!all_expired);
 
         tcmu_blocks_release(&udev->data_blocks, 0, udev->dbi_max + 1);
-        kfree(udev->data_bitmap);
+        bitmap_free(udev->data_bitmap);
         mutex_unlock(&udev->cmdr_lock);
 
         call_rcu(&dev->rcu_head, tcmu_dev_call_rcu);
@@ -1794,11 +1794,12 @@ static int tcmu_netlink_event_send(struct tcmu_dev *udev,
 
         ret = genlmsg_multicast_allns(&tcmu_genl_family, skb, 0,
                                       TCMU_MCGRP_CONFIG, GFP_KERNEL);
-        /* We don't care if no one is listening */
-        if (ret == -ESRCH)
-                ret = 0;
-        if (!ret)
-                ret = tcmu_wait_genl_cmd_reply(udev);
+
+        /* Wait during an add as the listener may not be up yet */
+        if (ret == 0 ||
+           (ret == -ESRCH && cmd == TCMU_CMD_ADDED_DEVICE))
+                return tcmu_wait_genl_cmd_reply(udev);
+
         return ret;
 }
 
@@ -1870,9 +1871,7 @@ static int tcmu_configure_device(struct se_device *dev)
         info = &udev->uio_info;
 
         mutex_lock(&udev->cmdr_lock);
-        udev->data_bitmap = kcalloc(BITS_TO_LONGS(udev->max_blocks),
-                                    sizeof(unsigned long),
-                                    GFP_KERNEL);
+        udev->data_bitmap = bitmap_zalloc(udev->max_blocks, GFP_KERNEL);
         mutex_unlock(&udev->cmdr_lock);
         if (!udev->data_bitmap) {
                 ret = -ENOMEM;
@@ -1959,7 +1958,7 @@ err_register:
         vfree(udev->mb_addr);
         udev->mb_addr = NULL;
 err_vzalloc:
-        kfree(udev->data_bitmap);
+        bitmap_free(udev->data_bitmap);
         udev->data_bitmap = NULL;
 err_bitmap_alloc:
         kfree(info->name);