Merge tag 'please-pull-getrandom' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 27ab310..1a0d184 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -81,9 +81,9 @@ struct scsi_device {
        struct list_head    siblings;   /* list of all devices on this host */
        struct list_head    same_target_siblings; /* just the devices sharing same target id */
 
-       /* this is now protected by the request_queue->queue_lock */
-       unsigned int device_busy;       /* commands actually active on
-                                        * low-level. protected by queue_lock. */
+       atomic_t device_busy;           /* commands actually active on LLDD */
+       atomic_t device_blocked;        /* Device returned QUEUE_FULL. */
+
        spinlock_t list_lock;
        struct list_head cmd_list;      /* queue of in use SCSI Command structures */
        struct list_head starved_entry;
@@ -98,8 +98,8 @@ struct scsi_device {
 
        unsigned long last_queue_ramp_up;       /* last queue ramp up time */
 
-       unsigned int id, lun, channel;
-
+       unsigned int id, channel;
+       u64 lun;
        unsigned int manufacturer;      /* Manufacturer of device, for using 
                                         * vendor-specific cmd's */
        unsigned sector_size;   /* size in bytes */
@@ -127,7 +127,6 @@ struct scsi_device {
                                 * pass settings from slave_alloc to scsi
                                 * core. */
        unsigned int eh_timeout; /* Error handling timeout */
-       unsigned writeable:1;
        unsigned removable:1;
        unsigned changed:1;     /* Data invalid due to media change */
        unsigned busy:1;        /* Used to prevent races */
@@ -155,6 +154,7 @@ struct scsi_device {
        unsigned skip_ms_page_8:1;      /* do not use MODE SENSE page 0x08 */
        unsigned skip_ms_page_3f:1;     /* do not use MODE SENSE page 0x3f */
        unsigned skip_vpd_pages:1;      /* do not read VPD pages */
+       unsigned try_vpd_pages:1;       /* attempt to read VPD pages */
        unsigned use_192_bytes_for_3f:1; /* ask for 192 bytes from page 0x3f */
        unsigned no_start_on_add:1;     /* do not issue start on add */
        unsigned allow_restart:1; /* issue START_UNIT in error handler */
@@ -182,8 +182,6 @@ struct scsi_device {
        struct list_head event_list;    /* asserted events */
        struct work_struct event_work;
 
-       unsigned int device_blocked;    /* Device returned QUEUE_FULL. */
-
        unsigned int max_device_blocked; /* what device_blocked counts down from  */
 #define SCSI_DEFAULT_DEVICE_BLOCKED    3
 
@@ -291,14 +289,15 @@ struct scsi_target {
        unsigned int            expecting_lun_change:1; /* A device has reported
                                                 * a 3F/0E UA, other devices on
                                                 * the same target will also. */
-       /* commands actually active on LLD. protected by host lock. */
-       unsigned int            target_busy;
+       /* commands actually active on LLD. */
+       atomic_t                target_busy;
+       atomic_t                target_blocked;
+
        /*
         * LLDs should set this in the slave_alloc host template callout.
         * If set to zero then there is not limit.
         */
        unsigned int            can_queue;
-       unsigned int            target_blocked;
        unsigned int            max_target_blocked;
 #define SCSI_DEFAULT_TARGET_BLOCKED    3
 
@@ -321,9 +320,9 @@ static inline struct scsi_target *scsi_target(struct scsi_device *sdev)
        dev_printk(prefix, &(starget)->dev, fmt, ##a)
 
 extern struct scsi_device *__scsi_add_device(struct Scsi_Host *,
-               uint, uint, uint, void *hostdata);
+               uint, uint, u64, void *hostdata);
 extern int scsi_add_device(struct Scsi_Host *host, uint channel,
-                          uint target, uint lun);
+                          uint target, u64 lun);
 extern int scsi_register_device_handler(struct scsi_device_handler *scsi_dh);
 extern void scsi_remove_device(struct scsi_device *);
 extern int scsi_unregister_device_handler(struct scsi_device_handler *scsi_dh);
@@ -332,13 +331,13 @@ void scsi_attach_vpd(struct scsi_device *sdev);
 extern int scsi_device_get(struct scsi_device *);
 extern void scsi_device_put(struct scsi_device *);
 extern struct scsi_device *scsi_device_lookup(struct Scsi_Host *,
-                                             uint, uint, uint);
+                                             uint, uint, u64);
 extern struct scsi_device *__scsi_device_lookup(struct Scsi_Host *,
-                                               uint, uint, uint);
+                                               uint, uint, u64);
 extern struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *,
-                                                       uint);
+                                                       u64);
 extern struct scsi_device *__scsi_device_lookup_by_target(struct scsi_target *,
-                                                         uint);
+                                                         u64);
 extern void starget_for_each_device(struct scsi_target *, void *,
                     void (*fn)(struct scsi_device *, void *));
 extern void __starget_for_each_device(struct scsi_target *, void *,
@@ -411,13 +410,13 @@ 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, unsigned int lun, int rescan);
+                            unsigned int id, u64 lun, int 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);
 extern void scsi_remove_target(struct device *);
-extern void int_to_scsilun(unsigned int, struct scsi_lun *);
-extern int scsilun_to_int(struct scsi_lun *);
+extern void int_to_scsilun(u64, struct scsi_lun *);
+extern u64 scsilun_to_int(struct scsi_lun *);
 extern const char *scsi_device_state_name(enum scsi_device_state);
 extern int scsi_is_sdev_device(const struct device *);
 extern int scsi_is_target_device(const struct device *);