diff options
| author | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic> | 2005-04-18 13:45:00 -0500 |
| commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
| tree | 284912295d46a861930d0619788a650f56c2a29b /include/scsi/scsi_host.h | |
| parent | c2a9331c62216e222a08de8dd58559367fef0af6 (diff) | |
| parent | f59114b7b5dc677bbd7cc7e26a5fcb3572a3445c (diff) | |
| download | op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.zip op-kernel-dev-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.gz | |
merge by hand (scsi_device.h)
Diffstat (limited to 'include/scsi/scsi_host.h')
| -rw-r--r-- | include/scsi/scsi_host.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 27f2c4e..1cee1e1 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 */ |
