From patchwork Tue Dec 12 12:23:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10106857 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B438E60327 for ; Tue, 12 Dec 2017 12:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC2A229B82 for ; Tue, 12 Dec 2017 12:23:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A101029B95; Tue, 12 Dec 2017 12:23:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0033429B82 for ; Tue, 12 Dec 2017 12:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751554AbdLLMXq (ORCPT ); Tue, 12 Dec 2017 07:23:46 -0500 Received: from mout.web.de ([212.227.15.4]:52119 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274AbdLLMXo (ORCPT ); Tue, 12 Dec 2017 07:23:44 -0500 Received: from [192.168.1.3] ([77.181.137.123]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M5sDZ-1fHGA742Wn-00xt2Z; Tue, 12 Dec 2017 13:23:31 +0100 Subject: [PATCH 2/2] target: cxgbit: Combine substrings for 11 messages From: SF Markus Elfring To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, Bart Van Assche , "David S. Miller" , Ingo Molnar , Johannes Berg , "Nicholas A. Bellinger" , Varun Prakash Cc: LKML , kernel-janitors@vger.kernel.org References: <77d06f1c-a650-644f-7364-55bb52aeb6ac@users.sourceforge.net> Message-ID: <5cb63750-250e-2eff-c06e-7c9083dd4919@users.sourceforge.net> Date: Tue, 12 Dec 2017 13:23:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <77d06f1c-a650-644f-7364-55bb52aeb6ac@users.sourceforge.net> Content-Language: en-GB X-Provags-ID: V03:K0:ZQBgKq9QM2oix9XqIOZDq9ExtdyxqBnsoE2jkBggT/Kt9nRABVa 7F9G8q2czQwFUiPTsyKNM3qE3S2+bH20eNxIrIPla0ZgLYpNEH6NpurDnJenXwBzkssvd0Z 3g8VwHJKuyvdrJT3QXfOj6vZp6MBoscIJzgA2mDW58q+relxDnN7kFZxZN1sWyjWjCROxH/ 80wmPtyaOqOc9gu8clRcQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:vEVJ0kI3wQ0=:R9DAns4IFSyOl91GYl8ZIS u3QdgtIFRdY0rW6uJn8UVi4XWfljHnw1iXg52UzmDgFdLTusG9kQAu6+5TKRXhSYBWzFVHMfr /jeFPzthdapmyvyPd3Y0gG6gGRRp09t3a6xfzDdQstgYONY6dYBxMofJT544NAYv//k5MGnyu 3B47Bm0aUn6ACif8424kJVFSXBwTGTR+/j35l/Ngoc9joVsqm77qX3IC75fouWr6mZTGcTt8N 5wLL3wKKDAIjV6JKqvwSiauc+lygEP3P/quwohrpUfJE0I561/CsE/hbMB/eJrYH5mith70YN KOPJzi26UjwDEdC7j15yJaCRuqd19SubTIr2IXZQBHz8bIbH3pRaihBjUqn6m/BlPo0rRhv23 cI08YU9D3j/aljaJP/wgz7ARu7DVpjGaTWszdQdNN+LKoz4irNAobxaO3ZYHFLrmE9R6TAvN+ qGkXfOTsf5z75I6vwLxD+8SYwfVai+s1nPiXLtrFpghBMqL/7Bt1/iW1Mc7c699iNxhwbpsqn 1CXFQgUia0T5CBMW61NoYlzfpX3+6a4iRFr9aF2MBNz9ZHkXdla+uKkBByQg7mv7w+6OaLcBU ByxaO1l/2X45JrVI9WK9hOdCOwn4lE7jO5YcReM/gwOsexeK6/8S1CuN/HR2TnbJfWwu6+wKG NH/8i68wupfmINPrxZ8YbOeqgky8LyPcgKx5AhnXvEmOTtdlbOTg38fyjqPJz1H5l4qSdY5Dd 99v29QO6kfNv0SBcZgE42jeOqYZSmqhMYgqAMz5msQCzVUO3M3aKVLykN4FZGUuE3T3IRUNZD sAlgkxZPs+ldVpoMLBOrMiEftnmRkkHam+ntfa1ppfd4WZyv2Y= Sender: target-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: target-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Tue, 12 Dec 2017 12:57:47 +0100 The script "checkpatch.pl" pointed information out like the following. WARNING: quoted string split across lines Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/target/iscsi/cxgbit/cxgbit_target.c | 50 +++++++++-------------------- 1 file changed, 16 insertions(+), 34 deletions(-) diff --git a/drivers/target/iscsi/cxgbit/cxgbit_target.c b/drivers/target/iscsi/cxgbit/cxgbit_target.c index 9163152b6d0b..e4a0dbc8fb9d 100644 --- a/drivers/target/iscsi/cxgbit/cxgbit_target.c +++ b/drivers/target/iscsi/cxgbit/cxgbit_target.c @@ -881,9 +881,7 @@ cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, if (pdu_cb->flags & PDUCBF_RX_DCRC_ERR) { pr_err("ImmediateData CRC32C DataDigest error\n"); if (!conn->sess->sess_ops->ErrorRecoveryLevel) { - pr_err("Unable to recover from" - " Immediate Data digest failure while" - " in ERL=0.\n"); + pr_err("Unable to recover from Immediate Data digest failure while in ERL=0.\n"); iscsit_reject_cmd(cmd, ISCSI_REASON_DATA_DIGEST_ERROR, (unsigned char *)hdr); return IMMEDIATE_DATA_CANNOT_RECOVER; @@ -1054,19 +1052,14 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk) } if (pdu_cb->flags & PDUCBF_RX_DCRC_ERR) { - pr_err("ITT: 0x%08x, Offset: %u, Length: %u," - " DataSN: 0x%08x\n", - hdr->itt, hdr->offset, data_len, - hdr->datasn); - + pr_err("ITT: 0x%08x, Offset: %u, Length: %u, DataSN: 0x%08x\n", + hdr->itt, hdr->offset, data_len, hdr->datasn); dcrc_err = true; goto check_payload; } - pr_debug("DataOut data_len: %u, " - "write_data_done: %u, data_length: %u\n", - data_len, cmd->write_data_done, - cmd->se_cmd.data_length); + pr_debug("DataOut data_len: %u, write_data_done: %u, data_length: %u\n", + data_len, cmd->write_data_done, cmd->se_cmd.data_length); if (!(pdu_cb->flags & PDUCBF_RX_DATA_DDPD)) { u32 skip = data_offset % PAGE_SIZE; @@ -1102,9 +1095,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) if (pdu_cb->flags & PDUCBF_RX_DCRC_ERR) { if (!conn->sess->sess_ops->ErrorRecoveryLevel) { - pr_err("Unable to recover from" - " NOPOUT Ping DataCRC failure while in" - " ERL=0.\n"); + pr_err("Unable to recover from NOPOUT Ping DataCRC failure while in ERL=0.\n"); ret = -1; goto out; } else { @@ -1112,9 +1103,8 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) * drop this PDU and let the * initiator plug the CmdSN gap. */ - pr_info("Dropping NOPOUT" - " Command CmdSN: 0x%08x due to" - " DataCRC error.\n", hdr->cmdsn); + pr_info("Dropping NOPOUT Command CmdSN: 0x%08x due to DataCRC error.\n", + hdr->cmdsn); ret = 0; goto out; } @@ -1139,9 +1129,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) */ cmd->buf_ptr = ping_data; cmd->buf_ptr_size = payload_length; - - pr_debug("Got %u bytes of NOPOUT ping" - " data.\n", payload_length); + pr_debug("Got %u bytes of NOPOUT ping data.\n", payload_length); pr_debug("Ping Data: \"%s\"\n", ping_data); } @@ -1168,18 +1156,15 @@ cxgbit_handle_text_cmd(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) if (pdu_cb->flags & PDUCBF_RX_DCRC_ERR) { if (!conn->sess->sess_ops->ErrorRecoveryLevel) { - pr_err("Unable to recover from" - " Text Data digest failure while in" - " ERL=0.\n"); + pr_err("Unable to recover from Text Data digest failure while in ERL=0.\n"); goto reject; } else { /* * drop this PDU and let the * initiator plug the CmdSN gap. */ - pr_info("Dropping Text" - " Command CmdSN: 0x%08x due to" - " DataCRC error.\n", hdr->cmdsn); + pr_info("Dropping Text Command CmdSN: 0x%08x due to DataCRC error.\n", + hdr->cmdsn); return 0; } } @@ -1302,8 +1287,8 @@ static int cxgbit_rx_opcode(struct cxgbit_sock *csk) if (conn->sess->sess_ops->SessionType && ((!(opcode & ISCSI_OP_TEXT)) || (!(opcode & ISCSI_OP_LOGOUT)))) { - pr_err("Received illegal iSCSI Opcode: 0x%02x" - " while in Discovery Session, rejecting.\n", opcode); + pr_err("Received illegal iSCSI Opcode: 0x%02x while in Discovery Session, rejecting.\n", + opcode); iscsit_add_reject(conn, ISCSI_REASON_PROTOCOL_ERROR, (unsigned char *)hdr); goto transport_err; @@ -1327,9 +1312,7 @@ static int cxgbit_rx_login_pdu(struct cxgbit_sock *csk) login_req = (struct iscsi_login_req *)login->req; memcpy(login_req, pdu_cb->hdr, sizeof(*login_req)); - - pr_debug("Got Login Command, Flags 0x%02x, ITT: 0x%08x," - " CmdSN: 0x%08x, ExpStatSN: 0x%08x, CID: %hu, Length: %u\n", + pr_debug("Got Login Command, Flags 0x%02x, ITT: 0x%08x, CmdSN: 0x%08x, ExpStatSN: 0x%08x, CID: %hu, Length: %u\n", login_req->flags, login_req->itt, login_req->cmdsn, login_req->exp_statsn, login_req->cid, pdu_cb->dlen); /* @@ -1394,8 +1377,7 @@ static void cxgbit_lro_skb_dump(struct sk_buff *skb) skb, lro_cb->csk, lro_cb->pdu_idx, lro_cb->pdu_totallen); for (i = 0; i < lro_cb->pdu_idx; i++, pdu_cb++) - pr_info("skb 0x%p, pdu %d, %u, f 0x%x, seq 0x%x, dcrc 0x%x, " - "frags %u.\n", + pr_info("skb 0x%p, pdu %d, %u, f 0x%x, seq 0x%x, dcrc 0x%x, frags %u.\n", skb, i, pdu_cb->pdulen, pdu_cb->flags, pdu_cb->seq, pdu_cb->ddigest, pdu_cb->frags); for (i = 0; i < ssi->nr_frags; i++)