From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sat, 04 Nov 2017 13:16:36 +0000 Subject: [PATCH 2/4] target: Combine two condition checks into one statement in target_xcopy_do_work() Message-Id: <09a6b5ba-70b7-ba4d-ad4f-6450c9da6208@users.sourceforge.net> List-Id: References: <27e27d42-473d-e8db-fe9e-803fed646881@users.sourceforge.net> In-Reply-To: <27e27d42-473d-e8db-fe9e-803fed646881@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, "Nicholas A. Bellinger" Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Sat, 4 Nov 2017 13:26:46 +0100 The same label was used by goto statements after two condition checks. Thus use a single statement instead. Signed-off-by: Markus Elfring --- drivers/target/target_core_xcopy.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c index b06877c57765..46cac36014df 100644 --- a/drivers/target/target_core_xcopy.c +++ b/drivers/target/target_core_xcopy.c @@ -802,10 +802,8 @@ static void target_xcopy_do_work(struct work_struct *work) int rc = 0; unsigned short nolb, cur_nolb, max_nolb, copied_nolb = 0; - if (target_parse_xcopy_cmd(xop) != TCM_NO_SENSE) - goto err_free_xop; - - if (WARN_ON_ONCE(!xop->src_dev) || WARN_ON_ONCE(!xop->dst_dev)) + if (target_parse_xcopy_cmd(xop) != TCM_NO_SENSE || + WARN_ON_ONCE(!xop->src_dev) || WARN_ON_ONCE(!xop->dst_dev)) goto err_free_xop; src_dev = xop->src_dev; -- 2.15.0