summaryrefslogtreecommitdiffstats
path: root/include/scsi/scsi_device.h
diff options
context:
space:
mode:
author <htejun@gmail.com>2005-04-17 14:57:29 -0500
committerJames Bottomley <jejb@titanic>2005-04-18 12:35:31 -0500
commit06f81ea8ca09b880cadf101d7e23b500e9c164bc (patch)
tree87e70ac102f2498214f42e8f0ad879513669881b /include/scsi/scsi_device.h
parentbf341919dbc1fbcbb565fb3224c840760ebd9f85 (diff)
downloadlinux-06f81ea8ca09b880cadf101d7e23b500e9c164bc.tar.bz2
[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/scsi_device.h')
-rw-r--r--include/scsi/scsi_device.h3
1 files changed, 2 insertions, 1 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 */