diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-05 05:41:40 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-05 05:41:40 +0300 |
| commit | c12f83c3099c4dd73fe721409d2ce18ca79a753d (patch) | |
| tree | 3c81b4400d9f281e210eb725d7f5f5779bdf7246 /fs/jbd2/commit.c | |
| parent | fab3e94a624f6ac6c4d8b8dc027bb03818a6cf1b (diff) | |
| parent | 21b81716c6bff24cda52dc75588455f879ddbfe9 (diff) | |
| download | linux-c12f83c3099c4dd73fe721409d2ce18ca79a753d.tar.xz | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"Two fairly simple fixes.
One is a regression with ipr firmware loading caused by one of the
trivial patches in the last merge window which failed to strip the \n
from the file name string, so now the firmware loader no longer works
leading to a lot of unhappy ipr users; fix by stripping the \n.
The second is a memory leak within SCSI: the BLK_PREP_INVALID state
was introduced a recent fix but we forgot to account for it correctly
when freeing state, resulting in memory leakage. Add the correct
state freeing in scsi_prep_return()"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
ipr: Fix regression when loading firmware
SCSI: Free resources when we return BLKPREP_INVALID
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions