Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 901b2082 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 298e3204 70a0f2c1

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -7747,8 +7747,7 @@ F: Documentation/scsi/LICENSE.qla2xxx 
F:	drivers/scsi/qla2xxx/



QLOGIC QLA4XXX iSCSI DRIVER

M:	Vikas Chaudhary <vikas.chaudhary@qlogic.com>

M:	iscsi-driver@qlogic.com

M:	QLogic-Storage-Upstream@qlogic.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/LICENSE.qla4xxx

drivers/scsi/scsi_lib.c

+1 −2
Original line number Diff line number Diff line
@@ -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;