From patchwork Thu Apr 25 07:40:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 2487531 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B9F4CDF5B1 for ; Thu, 25 Apr 2013 07:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756476Ab3DYHx3 (ORCPT ); Thu, 25 Apr 2013 03:53:29 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:44527 "EHLO linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756375Ab3DYHwb (ORCPT ); Thu, 25 Apr 2013 03:52:31 -0400 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id 3945A22D9D4; Thu, 25 Apr 2013 07:40:34 +0000 (UTC) From: "Nicholas A. Bellinger" To: target-devel Cc: linux-rdma , linux-scsi , linux-kernel , Roland Dreier , Or Gerlitz , Nicholas Bellinger Subject: [PATCH/for-next 1/3] iscsi-target: Fix solicited NopIN handling with RDMAExtentions=No Date: Thu, 25 Apr 2013 07:40:29 +0000 Message-Id: <1366875631-18795-2-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1366875631-18795-1-git-send-email-nab@linux-iscsi.org> References: <1366875631-18795-1-git-send-email-nab@linux-iscsi.org> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Nicholas Bellinger This patches fixes a regression with solicited NopIN handling in traditional iSCSI code introduced during TX immediate queue refactoring for v3.10 for-next code. Cc: Or Gerlitz Signed-off-by: Nicholas Bellinger --- drivers/target/iscsi/iscsi_target.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 0148cc3..5eee9b7 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -3762,12 +3762,6 @@ check_rsp_state: break; case ISTATE_SEND_NOPIN: ret = iscsit_send_nopin(cmd, conn); - if (!ret) { - spin_lock_bh(&cmd->istate_lock); - cmd->i_state = ISTATE_SENT_STATUS; - spin_unlock_bh(&cmd->istate_lock); - return 0; - } break; case ISTATE_SEND_REJECT: ret = iscsit_send_reject(cmd, conn);