Commit 901b2082b51d4f1c6deac5d5264a744b793ed46f
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley: "This is one fix for a Multiqueue sleeping in invalid context problem and a MAINTAINER file update for Qlogic" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ->queue_rq can't sleep MAINTAINERS: Update maintainer list for qla4xxx
Showing 2 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -7747,8 +7747,7 @@ |
| 7747 | 7747 | F: drivers/scsi/qla2xxx/ |
| 7748 | 7748 | |
| 7749 | 7749 | QLOGIC QLA4XXX iSCSI DRIVER |
| 7750 | -M: Vikas Chaudhary <vikas.chaudhary@qlogic.com> | |
| 7751 | -M: iscsi-driver@qlogic.com | |
| 7750 | +M: QLogic-Storage-Upstream@qlogic.com | |
| 7752 | 7751 | L: linux-scsi@vger.kernel.org |
| 7753 | 7752 | S: Supported |
| 7754 | 7753 | F: Documentation/scsi/LICENSE.qla4xxx |
drivers/scsi/scsi_lib.c
| ... | ... | @@ -591,7 +591,6 @@ |
| 591 | 591 | static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq) |
| 592 | 592 | { |
| 593 | 593 | struct scatterlist *first_chunk = NULL; |
| 594 | - gfp_t gfp_mask = mq ? GFP_NOIO : GFP_ATOMIC; | |
| 595 | 594 | int ret; |
| 596 | 595 | |
| 597 | 596 | BUG_ON(!nents); |
| ... | ... | @@ -606,7 +605,7 @@ |
| 606 | 605 | } |
| 607 | 606 | |
| 608 | 607 | ret = __sg_alloc_table(&sdb->table, nents, SCSI_MAX_SG_SEGMENTS, |
| 609 | - first_chunk, gfp_mask, scsi_sg_alloc); | |
| 608 | + first_chunk, GFP_ATOMIC, scsi_sg_alloc); | |
| 610 | 609 | if (unlikely(ret)) |
| 611 | 610 | scsi_free_sgtable(sdb, mq); |
| 612 | 611 | return ret; |