diff options
| author | <htejun@gmail.com> | 2005-04-17 21:57:29 +0200 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 19:35:31 +0200 |
| commit | 06f81ea8ca09b880cadf101d7e23b500e9c164bc (patch) | |
| tree | 87e70ac102f2498214f42e8f0ad879513669881b /include/scsi | |
| parent | scsi: add DID_REQUEUE to the error handling (diff) | |
| download | linux-06f81ea8ca09b880cadf101d7e23b500e9c164bc.tar.xz linux-06f81ea8ca09b880cadf101d7e23b500e9c164bc.zip | |
[PATCH] scsi: remove volatile from scsi data
This patch removes volatile qualifier from scsi_device->device_busy,
Scsi_Host->host_busy and ->host_failed as the volatile qualifiers
don't serve any purpose now. While at it, convert those fields from
unsigned short to unsigned int as suggested by Christoph.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_device.h | 3 | ||||
| -rw-r--r-- | include/scsi/scsi_host.h | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 07d974051b0c..7099d2ce967e 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -43,7 +43,8 @@ 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 */ - volatile unsigned short device_busy; /* commands actually active on low-level */ + unsigned int device_busy; /* commands actually active on + * low-level. protected by queue_lock. */ spinlock_t sdev_lock; /* also the request queue_lock */ spinlock_t list_lock; struct list_head cmd_list; /* queue of in use SCSI Command structures */ diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 27f2c4e8943a..1cee1e100943 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -448,8 +448,14 @@ struct Scsi_Host { wait_queue_head_t host_wait; struct scsi_host_template *hostt; struct scsi_transport_template *transportt; - volatile unsigned short host_busy; /* commands actually active on low-level */ - volatile unsigned short host_failed; /* commands that failed. */ + + /* + * The following two fields are protected with host_lock; + * however, eh routines can safely access during eh processing + * without acquiring the lock. + */ + unsigned int host_busy; /* commands actually active on low-level */ + unsigned int host_failed; /* commands that failed. */ unsigned short host_no; /* Used for IOCTL_GET_IDLUN, /proc/scsi et al. */ int resetting; /* if set, it means that last_reset is a valid value */ |