diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 18:21:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-30 18:21:50 -0500 |
| commit | ed9fd93e9a0c327e5d02313ba6e233c8e76da118 (patch) | |
| tree | 77b3ac9a1243e29bad14e5d3cb80f1ffe8d60bb6 /include | |
| parent | 52c7b3f45dbf19359be60a95b8678656e73ce42b (diff) | |
| parent | 4e46bf89972b9d98a9f282a9fed2359756a5e34e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] fix crash when disconnecting usb storage
[SCSI] fix async scan add/remove race resulting in an oops
[SCSI] sd: Return correct error code for DIF
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 9af48cbf0036..f097ae340bc1 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h | |||
| @@ -145,6 +145,7 @@ struct scsi_device { | |||
| 145 | unsigned retry_hwerror:1; /* Retry HARDWARE_ERROR */ | 145 | unsigned retry_hwerror:1; /* Retry HARDWARE_ERROR */ |
| 146 | unsigned last_sector_bug:1; /* do not use multisector accesses on | 146 | unsigned last_sector_bug:1; /* do not use multisector accesses on |
| 147 | SD_LAST_BUGGY_SECTORS */ | 147 | SD_LAST_BUGGY_SECTORS */ |
| 148 | unsigned is_visible:1; /* is the device visible in sysfs */ | ||
| 148 | 149 | ||
| 149 | DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ | 150 | DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */ |
| 150 | struct list_head event_list; /* asserted events */ | 151 | struct list_head event_list; /* asserted events */ |