diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-01 10:37:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-01 10:37:15 -0400 |
| commit | f51fdffad5b7709d0ade40736b58a2da2707fa15 (patch) | |
| tree | 6d188ad3361bf26446f3718d2c28f609082fd924 /drivers/scsi/scsi.c | |
| parent | 2161a2a644a6d33a29d68395518d103ed805758f (diff) | |
| parent | 539294b76af8922297702a7ebb8cafe68f7e5376 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"One final fix before 4.8.
There was a memory leak triggered by turning scsi mq off due to the
fact that we assume on host release that the already running hosts
weren't mq based because that's the state of the global flag (even
though they were).
Fix it by tracking this on a per host host basis"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: Avoid that toggling use_blk_mq triggers a memory leak
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 1f36aca44394..1deb6adc411f 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
| @@ -1160,7 +1160,6 @@ bool scsi_use_blk_mq = true; | |||
| 1160 | bool scsi_use_blk_mq = false; | 1160 | bool scsi_use_blk_mq = false; |
| 1161 | #endif | 1161 | #endif |
| 1162 | module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR | S_IRUGO); | 1162 | module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR | S_IRUGO); |
| 1163 | EXPORT_SYMBOL_GPL(scsi_use_blk_mq); | ||
| 1164 | 1163 | ||
| 1165 | static int __init init_scsi(void) | 1164 | static int __init init_scsi(void) |
| 1166 | { | 1165 | { |