mm: thp: split_huge_pmd_address() comment improvement

[cascardo/linux.git] / include / scsi / scsi_device.h

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 74d79bd..a6c346d 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -50,6 +50,12 @@ enum scsi_device_state {
        SDEV_CREATED_BLOCK,     /* same as above but for created devices */
 };
 
+enum scsi_scan_mode {
+       SCSI_SCAN_INITIAL = 0,
+       SCSI_SCAN_RESCAN,
+       SCSI_SCAN_MANUAL,
+};
+
 enum scsi_device_event {
        SDEV_EVT_MEDIA_CHANGE   = 1,    /* media has changed */
        SDEV_EVT_INQUIRY_CHANGE_REPORTED,               /* 3F 03  UA reported */
@@ -242,6 +248,7 @@ scmd_printk(const char *, const struct scsi_cmnd *, const char *, ...);
 enum scsi_target_state {
        STARGET_CREATED = 1,
        STARGET_RUNNING,
+       STARGET_REMOVE,
        STARGET_DEL,
 };
 
@@ -391,7 +398,8 @@ extern void scsi_device_resume(struct scsi_device *sdev);
 extern void scsi_target_quiesce(struct scsi_target *);
 extern void scsi_target_resume(struct scsi_target *);
 extern void scsi_scan_target(struct device *parent, unsigned int channel,
-                            unsigned int id, u64 lun, int rescan);
+                            unsigned int id, u64 lun,
+                            enum scsi_scan_mode rescan);
 extern void scsi_target_reap(struct scsi_target *);
 extern void scsi_target_block(struct device *);
 extern void scsi_target_unblock(struct device *, enum scsi_device_state);
@@ -534,9 +542,9 @@ static inline int scsi_device_supports_vpd(struct scsi_device *sdev)
        /*
         * Although VPD inquiries can go to SCSI-2 type devices,
         * some USB ones crash on receiving them, and the pages
-        * we currently ask for are for SPC-3 and beyond
+        * we currently ask for are mandatory for SPC-2 and beyond
         */
-       if (sdev->scsi_level > SCSI_SPC_2 && !sdev->skip_vpd_pages)
+       if (sdev->scsi_level >= SCSI_SPC_2 && !sdev->skip_vpd_pages)
                return 1;
        return 0;
 }