SCSI fixes for 3.19-rc4

GIT PULL James Bottomley 1 participant 1 message Jan 17, 2015 SCSI

lore

Share & tools

lore

James Bottomley

author maintainer

2015-01-17 20:40 UTC #0 lore raw

This is one fix for a Multiqueue sleeping in invalid context problem and a MAINTAINER file update for Qlogic.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

The short changelog is:

Christoph Hellwig (1):

      scsi: ->queue_rq can't sleep

Nilesh Javali (1):
MAINTAINERS: Update maintainer list for qla4xxx

And the diffstat:

 MAINTAINERS             | 3 +--
 drivers/scsi/scsi_lib.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

With full diff below.

James

---

MAINTAINERS +1 -2

index ddb9ac8..f6dee56 100644
@@ -7737,8 +7737,7 @@ F:	Documentation/scsi/LICENSE.qla2xxx
 F:	drivers/scsi/qla2xxx/
 
 QLOGIC QLA4XXX iSCSI DRIVER
-M:	Vikas Chaudhary <[email protected]>
-M:	[email protected]
+M:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	Documentation/scsi/LICENSE.qla4xxx

drivers/scsi/scsi_lib.c +1 -2

index 9ea95dd..6d5c0b8 100644
@@ -591,7 +591,6 @@ static void scsi_free_sgtable(struct scsi_data_buffer *sdb, bool mq)
 static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
 {
 	struct scatterlist *first_chunk = NULL;
-	gfp_t gfp_mask = mq ? GFP_NOIO : GFP_ATOMIC;
 	int ret;
 
 	BUG_ON(!nents);

@@ -606,7 +605,7 @@ static int scsi_alloc_sgtable(struct scsi_data_buffer *sdb, int nents, bool mq)
 	}
 
 	ret = __sg_alloc_table(&sdb->table, nents, SCSI_MAX_SG_SEGMENTS,
-			       first_chunk, gfp_mask, scsi_sg_alloc);
+			       first_chunk, GFP_ATOMIC, scsi_sg_alloc);
 	if (unlikely(ret))
 		scsi_free_sgtable(sdb, mq);
 	return ret;