[PATCH] scsi: remove volatile from scsi data
author <htejun@gmail.com> <>
Sun, 17 Apr 2005 19:57:29 +0000 (14:57 -0500)
committerJames Bottomley <jejb@titanic>
Mon, 18 Apr 2005 17:35:31 +0000 (12:35 -0500)
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>
include/scsi/scsi_device.h
include/scsi/scsi_host.h

index 07d974051b0c10b1381ea4b0a675076fe5210e71..7099d2ce967e673c43b64ca6404fc1015be93dcb 100644 (file)
@@ -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 */
index 27f2c4e8943ac35941cdbe36c9bd929ced644b79..1cee1e100943dafe00c14d5329b73659062a4d1a 100644 (file)
@@ -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 */