summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/scsi_scan.c7
-rw-r--r--drivers/scsi/scsi_transport_fc.c18
-rw-r--r--drivers/scsi/scsicam.c4
3 files changed, 16 insertions, 13 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6f7128f49c30..69979574004f 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1051,10 +1051,11 @@ static unsigned char *scsi_inq_str(unsigned char *buf, unsigned char *inq,
1051 * allocate and set it up by calling scsi_add_lun. 1051 * allocate and set it up by calling scsi_add_lun.
1052 * 1052 *
1053 * Return: 1053 * Return:
1054 * SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device 1054 *
1055 * SCSI_SCAN_TARGET_PRESENT: target responded, but no device is 1055 * - SCSI_SCAN_NO_RESPONSE: could not allocate or setup a scsi_device
1056 * - SCSI_SCAN_TARGET_PRESENT: target responded, but no device is
1056 * attached at the LUN 1057 * attached at the LUN
1057 * SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized 1058 * - SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized
1058 **/ 1059 **/
1059static int scsi_probe_and_add_lun(struct scsi_target *starget, 1060static int scsi_probe_and_add_lun(struct scsi_target *starget,
1060 u64 lun, int *bflagsp, 1061 u64 lun, int *bflagsp,
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index d4cf32d55546..1df77453f6b6 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2914,16 +2914,18 @@ EXPORT_SYMBOL(fc_remote_port_add);
2914 * port is no longer part of the topology. Note: Although a port 2914 * port is no longer part of the topology. Note: Although a port
2915 * may no longer be part of the topology, it may persist in the remote 2915 * may no longer be part of the topology, it may persist in the remote
2916 * ports displayed by the fc_host. We do this under 2 conditions: 2916 * ports displayed by the fc_host. We do this under 2 conditions:
2917 *
2917 * 1) If the port was a scsi target, we delay its deletion by "blocking" it. 2918 * 1) If the port was a scsi target, we delay its deletion by "blocking" it.
2918 * This allows the port to temporarily disappear, then reappear without 2919 * This allows the port to temporarily disappear, then reappear without
2919 * disrupting the SCSI device tree attached to it. During the "blocked" 2920 * disrupting the SCSI device tree attached to it. During the "blocked"
2920 * period the port will still exist. 2921 * period the port will still exist.
2922 *
2921 * 2) If the port was a scsi target and disappears for longer than we 2923 * 2) If the port was a scsi target and disappears for longer than we
2922 * expect, we'll delete the port and the tear down the SCSI device tree 2924 * expect, we'll delete the port and the tear down the SCSI device tree
2923 * attached to it. However, we want to semi-persist the target id assigned 2925 * attached to it. However, we want to semi-persist the target id assigned
2924 * to that port if it eventually does exist. The port structure will 2926 * to that port if it eventually does exist. The port structure will
2925 * remain (although with minimal information) so that the target id 2927 * remain (although with minimal information) so that the target id
2926 * bindings remails. 2928 * bindings remails.
2927 * 2929 *
2928 * If the remote port is not an FCP Target, it will be fully torn down 2930 * If the remote port is not an FCP Target, it will be fully torn down
2929 * and deallocated, including the fc_remote_port class device. 2931 * and deallocated, including the fc_remote_port class device.
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 910f4a7a3924..31273468589c 100644
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -116,8 +116,8 @@ EXPORT_SYMBOL(scsicam_bios_param);
116 * @hds: put heads here 116 * @hds: put heads here
117 * @secs: put sectors here 117 * @secs: put sectors here
118 * 118 *
119 * Description: determine the BIOS mapping/geometry used to create the partition 119 * Determine the BIOS mapping/geometry used to create the partition
120 * table, storing the results in *cyls, *hds, and *secs 120 * table, storing the results in @cyls, @hds, and @secs
121 * 121 *
122 * Returns: -1 on failure, 0 on success. 122 * Returns: -1 on failure, 0 on success.
123 */ 123 */