Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI updates from James Bottomley: "This is mostly updates of the usual suspects: lpfc, qla2xxx, bnx2fc, qedf, hpsa, hisi_sas, smartpqi, cxlflash, aacraid, csiostor along with a host of minor and miscellaneous changes" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (276 commits) qla2xxx: Fix NVMe entry_type for iocb packet on BE system scsi: qla2xxx: avoid unused-function warning scsi: snic: fix a couple of spelling mistakes/typos scsi: qla2xxx: fix a bunch of typos and spelling mistakes scsi: lpfc: don't double count abort errors scsi: lpfc: spin_lock_irq() is not nestable scsi: hisi_sas: optimise DMA slot memory scsi: ibmvfc: constify dev_pm_ops structures. scsi: ibmvscsi: constify dev_pm_ops structures. scsi: cxlflash: Update debug prints in reset handlers scsi: cxlflash: Update send_tmf() parameters scsi: cxlflash: Avoid double free of character device scsi: Add STARGET_CREATED_REMOVE state to scsi_target_state scsi: ses: do not add a device to an enclosure if enclosure_add_links() fails. scsi: ufs: flush eh_work when eh_work scheduled. scsi: qla2xxx: Protect access to qpair members with qpair->qp_lock scsi: sun_esp: fix device reference leaks scsi: fnic: changing queue command to return result DID_IMM_RETRY when rport is init scsi: fnic: correct speed display and add support for 25,40 and 100G scsi: fnic: added timestamp reporting in fnic debug stats ...
This commit is contained in:
@@ -1692,7 +1692,7 @@ fc_private_host_rd_attr(npiv_vports_inuse, "%u\n", 20);
|
||||
* Host Statistics Management
|
||||
*/
|
||||
|
||||
/* Show a given an attribute in the statistics group */
|
||||
/* Show a given attribute in the statistics group */
|
||||
static ssize_t
|
||||
fc_stat_show(const struct device *dev, char *buf, unsigned long offset)
|
||||
{
|
||||
@@ -2925,7 +2925,7 @@ EXPORT_SYMBOL(fc_remote_port_add);
|
||||
* attached to it. However, we want to semi-persist the target id assigned
|
||||
* to that port if it eventually does exist. The port structure will
|
||||
* remain (although with minimal information) so that the target id
|
||||
* bindings remails.
|
||||
* bindings also remain.
|
||||
*
|
||||
* If the remote port is not an FCP Target, it will be fully torn down
|
||||
* and deallocated, including the fc_remote_port class device.
|
||||
@@ -2939,7 +2939,7 @@ EXPORT_SYMBOL(fc_remote_port_add);
|
||||
* If the remote port does not return (signaled by a LLDD call to
|
||||
* fc_remote_port_add()) within the dev_loss_tmo timeout, then the
|
||||
* scsi target is removed - killing all outstanding i/o and removing the
|
||||
* scsi devices attached ot it. The port structure will be marked Not
|
||||
* scsi devices attached to it. The port structure will be marked Not
|
||||
* Present and be partially cleared, leaving only enough information to
|
||||
* recognize the remote port relative to the scsi target id binding if
|
||||
* it later appears. The port will remain as long as there is a valid
|
||||
@@ -3058,7 +3058,7 @@ fc_remote_port_rolechg(struct fc_rport *rport, u32 roles)
|
||||
* There may have been a delete timer running on the
|
||||
* port. Ensure that it is cancelled as we now know
|
||||
* the port is an FCP Target.
|
||||
* Note: we know the rport is exists and in an online
|
||||
* Note: we know the rport exists and is in an online
|
||||
* state as the LLDD would not have had an rport
|
||||
* reference to pass us.
|
||||
*
|
||||
@@ -3319,7 +3319,7 @@ EXPORT_SYMBOL(fc_block_scsi_eh);
|
||||
* @ret_vport: The pointer to the created vport.
|
||||
*
|
||||
* Allocates and creates the vport structure, calls the parent host
|
||||
* to instantiate the vport, the completes w/ class and sysfs creation.
|
||||
* to instantiate the vport, this completes w/ class and sysfs creation.
|
||||
*
|
||||
* Notes:
|
||||
* This routine assumes no locks are held on entry.
|
||||
@@ -3399,7 +3399,7 @@ fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
|
||||
|
||||
/*
|
||||
* if the parent isn't the physical adapter's Scsi_Host, ensure
|
||||
* the Scsi_Host at least contains ia symlink to the vport.
|
||||
* the Scsi_Host at least contains a symlink to the vport.
|
||||
*/
|
||||
if (pdev != &shost->shost_gendev) {
|
||||
error = sysfs_create_link(&shost->shost_gendev.kobj,
|
||||
|
Reference in New Issue
Block a user