From patchwork Sat Dec 12 14:42:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 7835031 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 413439F1C2 for ; Sat, 12 Dec 2015 14:43:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DFA7203AB for ; Sat, 12 Dec 2015 14:43:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08C342025A for ; Sat, 12 Dec 2015 14:43:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbbLLOms (ORCPT ); Sat, 12 Dec 2015 09:42:48 -0500 Received: from mout.web.de ([212.227.17.11]:54019 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752571AbbLLOmq (ORCPT ); Sat, 12 Dec 2015 09:42:46 -0500 Received: from [192.168.1.2] ([78.49.180.156]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0MCZh8-1ZzTdo494c-009MFE; Sat, 12 Dec 2015 15:42:43 +0100 Subject: [PATCH 5/7] iscsi-target: Rename a jump label in iscsi_create_default_params() To: linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, "Nicholas A. Bellinger" References: <566ABCD9.1060404@users.sourceforge.net> <566C2F7B.6030704@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <566C3262.6010105@users.sourceforge.net> Date: Sat, 12 Dec 2015 15:42:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <566C2F7B.6030704@users.sourceforge.net> X-Provags-ID: V03:K0:uBhvHldKILSUPxzrrJKrfwCNLw5qQlRpiHZQQ+8fM0bzokwcCTH KIFAwHRQlc9FiqZTd/a5HaEiR+LwAA0xCWUvDc0n8UFCjctOrDpAQkbXhFcKX4deF3ES8FV 8HpyTEMxC2s0paXGktlAsRNcrlvPEvIvNtaoMpdORsvBer/tM1cwua8ocEUs9lzdhDw4dm4 f4QhHFcgXgKpXEm7nwKjQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:BwquoQi6ZjE=:l6YbTVBdkeuPzUu8PkbRKB aokhhV4I9N18v2Q2aUDpALH0P4nDhefPNWyN4e59AfUjQ6DEOCkjLAQBV5PwAADidw7YbWZrV DIjlCWp09rUCnMAlaXt6HS9HPsx9f9guLth442Hqx7SEaw3i/ZNxgnyAqihxpfBz1iAhCRd5T xaQMsBXHr7d8ZnMb11KvzFnj75uHEsAiU6p3Ogw4B6A1cj/eDp+44C+wPWW2EkDrRPaAgBLOG 8Y21yfT1zkJRsPgmkL9f9bPmZpkPgyZtpR6cwoB2ip+jwLSXUZSQuFgPaBBnljIBWn4HTZSWo BBw0y/FyeQoueRlFvpCoHui+e1XklyJPtL7dHNdL+s1aymdL12gC7Y2mNM3wyqhYBvTJGruI8 8yKWD4zX+bxqRmCzpS8WfrER5965XVeJE3sxVTvDuZRdNuP/5Eup+dJApcD4y4nd6aK8qKvqO Yeg/nrPIqjxRH09QPKPHZXD5qecBIolJkLOqIIZQOk8t/sSxJl2eMiqvoZ0uL/3AEx92zD88O j3bjtImP0w3yLixbO5Vk6a8p0Dp/maDR33/FrF5MkYt/bXBvVDPHNOhQn+ROPYQM1td2Zi1nL 8eWsxxEWv6fyGsv9cWeJouYk8Yx4tCn5DLZrrSbvPKfMR85B7u2o6OwTf9RuY+/z1swfVSIWC OUJeE/+jvMN5bnwqlLUZslykGGYJ6Jh62b9txp1+vQ07Z86OVbQuif+S5UMUPYSCYs5Ol68GU LIfjSgc9BjtZWQE1pPL0Ucy9Y/BdTTWJ6+ZEvev2dsGPi/0xgwduocuCaby5L3buJTD/LMHPG n+Qc0bp Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, UPPERCASE_50_75 autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 12 Dec 2015 14:12:50 +0100 This issue was detected by using the Coccinelle software. Choose a jump label according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/target/iscsi/iscsi_target_parameters.c | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 3f3842f..29ecf29 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -225,185 +225,185 @@ int iscsi_create_default_params(struct iscsi_param_list **param_list_ptr) PHASE_SECURITY, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_AUTH, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, HEADERDIGEST, INITIAL_HEADERDIGEST, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_DIGEST, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, DATADIGEST, INITIAL_DATADIGEST, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_DIGEST, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, MAXCONNECTIONS, INITIAL_MAXCONNECTIONS, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_1_TO_65535, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, SENDTARGETS, INITIAL_SENDTARGETS, PHASE_FFP0, SCOPE_SESSION_WIDE, SENDER_INITIATOR, TYPERANGE_UTF8, 0); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, TARGETNAME, INITIAL_TARGETNAME, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_ISCSINAME, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, INITIATORNAME, INITIAL_INITIATORNAME, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_INITIATOR, TYPERANGE_ISCSINAME, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, TARGETALIAS, INITIAL_TARGETALIAS, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_TARGET, TYPERANGE_UTF8, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, INITIATORALIAS, INITIAL_INITIATORALIAS, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_INITIATOR, TYPERANGE_UTF8, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, TARGETADDRESS, INITIAL_TARGETADDRESS, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_TARGET, TYPERANGE_TARGETADDRESS, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, TARGETPORTALGROUPTAG, INITIAL_TARGETPORTALGROUPTAG, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_TARGET, TYPERANGE_0_TO_65535, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, INITIALR2T, INITIAL_INITIALR2T, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_BOOL_OR, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, IMMEDIATEDATA, INITIAL_IMMEDIATEDATA, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_BOOL_AND, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, MAXXMITDATASEGMENTLENGTH, INITIAL_MAXXMITDATASEGMENTLENGTH, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, MAXRECVDATASEGMENTLENGTH, INITIAL_MAXRECVDATASEGMENTLENGTH, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, MAXBURSTLENGTH, INITIAL_MAXBURSTLENGTH, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, FIRSTBURSTLENGTH, INITIAL_FIRSTBURSTLENGTH, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, DEFAULTTIME2WAIT, INITIAL_DEFAULTTIME2WAIT, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_0_TO_3600, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, DEFAULTTIME2RETAIN, INITIAL_DEFAULTTIME2RETAIN, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_0_TO_3600, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, MAXOUTSTANDINGR2T, INITIAL_MAXOUTSTANDINGR2T, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_1_TO_65535, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, DATAPDUINORDER, INITIAL_DATAPDUINORDER, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_BOOL_OR, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, DATASEQUENCEINORDER, INITIAL_DATASEQUENCEINORDER, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_BOOL_OR, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, ERRORRECOVERYLEVEL, INITIAL_ERRORRECOVERYLEVEL, PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_0_TO_2, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, SESSIONTYPE, INITIAL_SESSIONTYPE, PHASE_DECLARATIVE, SCOPE_SESSION_WIDE, SENDER_INITIATOR, TYPERANGE_SESSIONTYPE, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, IFMARKER, INITIAL_IFMARKER, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_BOOL_AND, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, OFMARKER, INITIAL_OFMARKER, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_BOOL_AND, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, IFMARKINT, INITIAL_IFMARKINT, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_UTF8, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, OFMARKINT, INITIAL_OFMARKINT, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_UTF8, USE_INITIAL_ONLY); if (!param) - goto out; + goto release_list; /* * Extra parameters for ISER from RFC-5046 @@ -412,25 +412,25 @@ int iscsi_create_default_params(struct iscsi_param_list **param_list_ptr) PHASE_OPERATIONAL, SCOPE_SESSION_WIDE, SENDER_BOTH, TYPERANGE_BOOL_AND, USE_LEADING_ONLY); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, INITIATORRECVDATASEGMENTLENGTH, INITIAL_INITIATORRECVDATASEGMENTLENGTH, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_ALL); if (!param) - goto out; + goto release_list; param = iscsi_set_default_param(pl, TARGETRECVDATASEGMENTLENGTH, INITIAL_TARGETRECVDATASEGMENTLENGTH, PHASE_OPERATIONAL, SCOPE_CONNECTION_ONLY, SENDER_BOTH, TYPERANGE_512_TO_16777215, USE_ALL); if (!param) - goto out; + goto release_list; *param_list_ptr = pl; return 0; -out: +release_list: iscsi_release_param_list(pl); return -1; }