Commit c3812b15 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:
 "One iscsi driver fix and one core fix.

  The core fix is an important one because a retry efficiency update is
  now causing some USB devices to get the wrong size on discovery (it
  upset their retry logic for READ_CAPACITY_16)"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request
  scsi: core: Fix command pass through retry regression
parents 79a1d390 63ca0222

drivers/scsi/scsi_lib.c

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ static int scsi_check_passthrough(struct scsi_cmnd *scmd, 
	struct scsi_sense_hdr sshdr;

	enum sam_status status;



	if (!scmd->result)

		return 0;



	if (!failures)

		return 0;

drivers/scsi/scsi_transport_iscsi.c

+3 −1
Original line number Diff line number Diff line
@@ -4104,7 +4104,7 @@ iscsi_if_rx(struct sk_buff *skb) 
		}

		do {

			/*

			 * special case for GET_STATS:

			 * special case for GET_STATS, GET_CHAP and GET_HOST_STATS:

			 * on success - sending reply and stats from

			 * inside of if_recv_msg(),

			 * on error - fall through.
@@ -4113,6 +4113,8 @@ iscsi_if_rx(struct sk_buff *skb) 
				break;

			if (ev->type == ISCSI_UEVENT_GET_CHAP && !err)

				break;

			if (ev->type == ISCSI_UEVENT_GET_HOST_STATS && !err)

				break;

			err = iscsi_if_send_reply(portid, nlh->nlmsg_type,

						  ev, sizeof(*ev));

			if (err == -EAGAIN && --retries < 0) {