Commit 06f81ea8 authored by 's avatar Committed by James Bottomley
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent bf341919

include/scsi/scsi_device.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

include/scsi/scsi_host.h

+8 −2
Original line number Diff line number Diff line
@@ -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 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE