diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-11 00:41:47 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-11 00:41:47 (GMT) |
| commit | 3259b12ae1c79c146809829412ddc0d11a1b8e26 (patch) | |
| tree | 6f11934a3ed95b0baac0e4c317d2a0df386ebbf5 /include | |
| parent | 49850a147c9cba958ce411f93f2aa6d4d92fe5e3 (diff) | |
| parent | bba0bdd7ad4713d82338bcd9b72d57e9335a664b (diff) | |
| download | linux-3259b12ae1c79c146809829412ddc0d11a1b8e26.tar.xz | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is our remaining set of three fixes for 4.0: two oops fixes(one
for cable pulls triggering oopses and the other be2iscsi specific) and
one warn on in sysfs on multipath devices using enclosures"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
Defer processing of REQ_PREEMPT requests for blocked devices
be2iscsi: Fix kernel panic when device initialization fails
enclosure: fix WARN_ON removing an adapter in multi-path devices
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index c294e3e..a1b25e3 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -181,7 +181,9 @@ enum rq_flag_bits { __REQ_ELVPRIV, /* elevator private data attached */ __REQ_FAILED, /* set if the request failed */ __REQ_QUIET, /* don't worry about errors */ - __REQ_PREEMPT, /* set for "ide_preempt" requests */ + __REQ_PREEMPT, /* set for "ide_preempt" requests and also + for requests for which the SCSI "quiesce" + state must be ignored. */ __REQ_ALLOCED, /* request came from our alloc pool */ __REQ_COPY_USER, /* contains copies of user pages */ __REQ_FLUSH_SEQ, /* request for flush sequence */ |