diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-02 09:36:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-02 09:36:21 -0700 |
| commit | d4edea40389d6646c760aa166103caa1f32298ed (patch) | |
| tree | 49d94c3407eeec996c7327fd118cb6c69b71cc00 /drivers/scsi/ipr.h | |
| parent | 30c7b56d63fc717bd0aa74da6e3cf354f2ed3b3e (diff) | |
| parent | 0c958ecc69c277b25f38f72bc6d18ab145e8167c (diff) | |
| download | op-kernel-dev-d4edea40389d6646c760aa166103caa1f32298ed.zip op-kernel-dev-d4edea40389d6646c760aa166103caa1f32298ed.tar.gz | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"A set of three fixes for the ipr driver and one fairly major one for
memory leaks in the mq path of SCSI"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: fix memory leak with scsi-mq
ipr: Fix invalid array indexing for HRRQ
ipr: Fix incorrect trace indexing
ipr: Fix locking for unit attention handling
Diffstat (limited to 'drivers/scsi/ipr.h')
| -rw-r--r-- | drivers/scsi/ipr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h index 73790a1..6b97ee4 100644 --- a/drivers/scsi/ipr.h +++ b/drivers/scsi/ipr.h @@ -1486,6 +1486,7 @@ struct ipr_ioa_cfg { #define IPR_NUM_TRACE_INDEX_BITS 8 #define IPR_NUM_TRACE_ENTRIES (1 << IPR_NUM_TRACE_INDEX_BITS) +#define IPR_TRACE_INDEX_MASK (IPR_NUM_TRACE_ENTRIES - 1) #define IPR_TRACE_SIZE (sizeof(struct ipr_trace_entry) * IPR_NUM_TRACE_ENTRIES) char trace_start[8]; #define IPR_TRACE_START_LABEL "trace" |
