From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224UYrmOS3gpIHj0n19KKw4ddq1pLewQaFhVaRYexHpwqcfKx9wPiiXe/A0hDuyBxXIikWk/ ARC-Seal: i=1; a=rsa-sha256; t=1517256988; cv=none; d=google.com; s=arc-20160816; b=S/+o7YZIsQygy38IkBYyVKTaJ9SRwdJn0b3XvpHpUX/I8zY2yOnej95sE98bv0tveA 2YKp0h1LDwyLhiaIGJBHhfi06cyDJZ1ncq3YzcI/Bzi0x0i58Rgc+IpVjGYIJbhXBbb7 ujpdv5z2uIC4B56JJUanqKL0zkOgNFO1ToOPkYOikVQdImWVzy+jKoQA4qZCbNoOeIUl v6RoDL6Xpv+NU4CxVOVrVscALLz3Z4wnDhkkY8YiJugWxqhO9EXjjJP2WgcBJky7Mb9r T9bd9mpeL2VV8/nmcW+vOn6Z7tclgZsbaxDvcE/Z8G0te8npW3+sMG2zHFV3puGWTg2J Bntw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=yteptquUMjG/axvpJSGdEomnkJjh66Fq6c63dNwQK98=; b=rK/36ODjqmRwA0qnAO8FOKRfjlWHNGFlnrCKE6ThlTtauPS34whBoR3en9j9WowQ2K GMWukIDBZbERJ1ihVxCpXF7fdVt16vYOhmbbWu/Qt23rbGE61AV68OpGnSImB7ZRGVtR ayW5u2QdW2DYSLxyNM7F7YMtb4GrH2MNLkN+mEwYsbpr6GCiCveHUK2VReAfascEXGof hinUuQRW16olQmXKfzNa+sZgeTqo+yxrMmF+iyBMQxQ3TZcoW3+n9RBl14+psujmNsUq Ou84mbQRnNQi9uj0QLiI4pY2uq4tXwe6j6NgBJ5vFd2CinEU/7KgVw4Ux//iIFteKgFx SQBA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Thumshirn , Lee Duncan , Hannes Reinecke , Bart Van Assche , Chris Leech , "Martin K. Petersen" Subject: [PATCH 3.18 35/52] scsi: libiscsi: fix shifting of DID_REQUEUE host byte Date: Mon, 29 Jan 2018 13:56:53 +0100 Message-Id: <20180129123629.726169937@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958879942292736?= X-GMAIL-MSGID: =?utf-8?q?1590959263776725062?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johannes Thumshirn commit eef9ffdf9cd39b2986367bc8395e2772bc1284ba upstream. The SCSI host byte should be shifted left by 16 in order to have scsi_decide_disposition() do the right thing (.i.e. requeue the command). Signed-off-by: Johannes Thumshirn Fixes: 661134ad3765 ("[SCSI] libiscsi, bnx2i: make bound ep check common") Cc: Lee Duncan Cc: Hannes Reinecke Cc: Bart Van Assche Cc: Chris Leech Acked-by: Lee Duncan Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/libiscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c @@ -1727,7 +1727,7 @@ int iscsi_queuecommand(struct Scsi_Host if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx)) { reason = FAILURE_SESSION_IN_RECOVERY; - sc->result = DID_REQUEUE; + sc->result = DID_REQUEUE << 16; goto fault; }