diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 13:22:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 13:22:32 -0700 |
| commit | 61f06db00e06b436dca4725c200c891ae8a4a92d (patch) | |
| tree | e361a38c395c7386fa2d63426b090f04db0fc744 /include | |
| parent | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | 3w-9xxx: fix command completion race (diff) | |
| download | linux-dev-61f06db00e06b436dca4725c200c891ae8a4a92d.tar.xz linux-dev-61f06db00e06b436dca4725c200c891ae8a4a92d.zip | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"This is three logical fixes (as 5 patches).
The 3ware class of drivers were causing an oops with multiqueue by
tearing down the command mappings after completing the command (where
the variables in the command used to tear down the mapping were
no-longer valid). There's also a fix for the qnap iscsi target which
was choking on us sending it commands that were too long and a fix for
the reworked aha1542 allocating GFP_KERNEL under a lock"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
3w-9xxx: fix command completion race
3w-xxxx: fix command completion race
3w-sas: fix command completion race
aha1542: Allocate memory before taking a lock
SCSI: add 1024 max sectors black list flag
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_devinfo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h index 183eaab7c380..96e3f56519e7 100644 --- a/include/scsi/scsi_devinfo.h +++ b/include/scsi/scsi_devinfo.h @@ -36,5 +36,6 @@ for sequential scan */ #define BLIST_TRY_VPD_PAGES 0x10000000 /* Attempt to read VPD pages */ #define BLIST_NO_RSOC 0x20000000 /* don't try to issue RSOC */ +#define BLIST_MAX_1024 0x40000000 /* maximum 1024 sector cdb length */ #endif |