diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 09:49:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 09:49:02 -0400 |
| commit | a2b9c1f6208126e6df6c02428c501f8853685812 (patch) | |
| tree | e36762d385bb490914a72485c4da4431e4b937d3 /include | |
| parent | 2e9521fd656f05a716b5294a7dbebd37ced05e43 (diff) | |
| parent | 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: don't delay blk_run_queue_async
scsi: remove performance regression due to async queue run
blk-throttle: Use task_subsys_state() to determine a task's blkio_cgroup
block: rescan partitions on invalidated devices on -ENOMEDIA too
cdrom: always check_disk_change() on open
block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_device.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 2d3ec509468..dd82e02ddde 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
| @@ -169,6 +169,7 @@ struct scsi_device { | |||
| 169 | sdev_dev; | 169 | sdev_dev; |
| 170 | 170 | ||
| 171 | struct execute_work ew; /* used to get process context on put */ | 171 | struct execute_work ew; /* used to get process context on put */ |
| 172 | struct work_struct requeue_work; | ||
| 172 | 173 | ||
| 173 | struct scsi_dh_data *scsi_dh_data; | 174 | struct scsi_dh_data *scsi_dh_data; |
| 174 | enum scsi_device_state sdev_state; | 175 | enum scsi_device_state sdev_state; |