Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933306Ab3GCQx3 (ORCPT ); Wed, 3 Jul 2013 12:53:29 -0400 Received: from longford.logfs.org ([213.229.74.203]:59730 "EHLO longford.logfs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932841Ab3GCQx0 (ORCPT ); Wed, 3 Jul 2013 12:53:26 -0400 From: Joern Engel To: "Nicholas A. Bellinger" Cc: linux-kernel@vger.kernel.org, target-devel , Joern Engel Subject: [PATCH 1/3] target: remove iscsit_find_cmd_from_itt_or_dump() Date: Wed, 3 Jul 2013 11:22:15 -0400 Message-Id: <1372864937-32437-2-git-send-email-joern@logfs.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1372864937-32437-1-git-send-email-joern@logfs.org> References: <1372864937-32437-1-git-send-email-joern@logfs.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3126 Lines: 82 Code is a copy of iscsit_find_cmd_from_itt(). Afaics this is debug code from at least two years ago. Either the bug in question has been long fixed or this debug code doesn't help fixing it. Whichever way you look at it, we should remove the debug code. Signed-off-by: Joern Engel --- drivers/target/iscsi/iscsi_target.c | 3 +-- drivers/target/iscsi/iscsi_target_util.c | 24 ------------------------ drivers/target/iscsi/iscsi_target_util.h | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 7ea246a..49346b3 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -1213,8 +1213,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf) buf, conn); } - cmd = iscsit_find_cmd_from_itt_or_dump(conn, hdr->itt, - payload_length); + cmd = iscsit_find_cmd_from_itt(conn, hdr->itt); if (!cmd) return 0; diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c index 7ce3505..e59dec0 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c @@ -369,30 +369,6 @@ struct iscsi_cmd *iscsit_find_cmd_from_itt( return NULL; } -struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump( - struct iscsi_conn *conn, - itt_t init_task_tag, - u32 length) -{ - struct iscsi_cmd *cmd; - - spin_lock_bh(&conn->cmd_lock); - list_for_each_entry(cmd, &conn->conn_cmd_list, i_conn_node) { - if (cmd->init_task_tag == init_task_tag) { - spin_unlock_bh(&conn->cmd_lock); - return cmd; - } - } - spin_unlock_bh(&conn->cmd_lock); - - pr_err("Unable to locate ITT: 0x%08x on CID: %hu," - " dumping payload\n", init_task_tag, conn->cid); - if (length) - iscsit_dump_data_payload(conn, length, 1); - - return NULL; -} - struct iscsi_cmd *iscsit_find_cmd_from_ttt( struct iscsi_conn *conn, u32 targ_xfer_tag) diff --git a/drivers/target/iscsi/iscsi_target_util.h b/drivers/target/iscsi/iscsi_target_util.h index 894d0f8..9614cb9 100644 --- a/drivers/target/iscsi/iscsi_target_util.h +++ b/drivers/target/iscsi/iscsi_target_util.h @@ -15,8 +15,6 @@ extern struct iscsi_r2t *iscsit_get_holder_for_r2tsn(struct iscsi_cmd *, u32); int iscsit_sequence_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, __be32 cmdsn); extern int iscsit_check_unsolicited_dataout(struct iscsi_cmd *, unsigned char *); extern struct iscsi_cmd *iscsit_find_cmd_from_itt(struct iscsi_conn *, itt_t); -extern struct iscsi_cmd *iscsit_find_cmd_from_itt_or_dump(struct iscsi_conn *, - itt_t, u32); extern struct iscsi_cmd *iscsit_find_cmd_from_ttt(struct iscsi_conn *, u32); extern int iscsit_find_cmd_for_recovery(struct iscsi_session *, struct iscsi_cmd **, struct iscsi_conn_recovery **, itt_t); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/