diff options
| author | James Bottomley | 2005-04-18 20:45:00 +0200 |
|---|---|---|
| committer | James Bottomley | 2005-04-18 20:45:00 +0200 |
| commit | c46f2ffb9e7fce7208c2639790e1ade42e00b146 (patch) | |
| tree | 284912295d46a861930d0619788a650f56c2a29b /include/scsi/scsi_device.h | |
| parent | updates for CFQ oops fix (diff) | |
| parent | [PATCH] scsi: scsi_send_eh_cmnd() cleanup (diff) | |
| download | kernel-qcow2-linux-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.gz kernel-qcow2-linux-c46f2ffb9e7fce7208c2639790e1ade42e00b146.tar.xz kernel-qcow2-linux-c46f2ffb9e7fce7208c2639790e1ade42e00b146.zip | |
merge by hand (scsi_device.h)
Diffstat (limited to 'include/scsi/scsi_device.h')
| -rw-r--r-- | include/scsi/scsi_device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index fe9571d2e306..c018020d9160 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -44,7 +44,8 @@ struct scsi_device { struct list_head same_target_siblings; /* just the devices sharing same target id */ /* this is now protected by the request_queue->queue_lock */ - 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 list_lock; struct list_head cmd_list; /* queue of in use SCSI Command structures */ struct list_head starved_entry; |