From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA4A3C433DB for ; Thu, 25 Mar 2021 11:34:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AC3A601FF for ; Thu, 25 Mar 2021 11:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231835AbhCYLeT (ORCPT ); Thu, 25 Mar 2021 07:34:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:35302 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231586AbhCYL2B (ORCPT ); Thu, 25 Mar 2021 07:28:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 892E061A52; Thu, 25 Mar 2021 11:27:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616671635; bh=q/qmcPMCJsL44JMnNHKA3zvjlGA4zMMtaI9g0Jmagwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HYtbn4YUGxIPxoTKGTqsGObAPxnBOyu8xEb9b3knEyZXBxezXRKD8R9+zYZIRLEto eXizlPiF6rbjjLF639gP1CM6pR2iwLReFBw7J3fX37wtqfOuHpr6GgVTvUF9NmJfUS cvxQ/BIdmBHbKzrXojiZ7I7XMS9ghNj/6KrliDPlsDh22/GmY472MCKuftS3xWqxDp QhMbOur7xKJu9tpzAjaJjf9JYgW3kNZAy6E9lD+RDUnZQlRUPc1hC6+RxUv5SRQxKL MfyodxfX+3La9ZpUl94jqXmrmPIU1qVwbpPJjRIHPwcrvaIIisKRzoQU+Lb1xIVVIb Sdb1GVU7sdrqQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexey Dobriyan , Himanshu Madhani , "Martin K . Petersen" , Sasha Levin , linux-scsi@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 18/24] scsi: qla2xxx: Fix broken #endif placement Date: Thu, 25 Mar 2021 07:26:44 -0400 Message-Id: <20210325112651.1927828-18-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210325112651.1927828-1-sashal@kernel.org> References: <20210325112651.1927828-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexey Dobriyan [ Upstream commit 5999b9e5b1f8a2f5417b755130919b3ac96f5550 ] Only half of the file is under include guard because terminating #endif is placed too early. Link: https://lore.kernel.org/r/YE4snvoW1SuwcXAn@localhost.localdomain Reviewed-by: Himanshu Madhani Signed-off-by: Alexey Dobriyan Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/qla2xxx/qla_target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h index d006f0a97b8c..2236751a3a56 100644 --- a/drivers/scsi/qla2xxx/qla_target.h +++ b/drivers/scsi/qla2xxx/qla_target.h @@ -116,7 +116,6 @@ (min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \ QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0)) #endif -#endif #define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \ ? le16_to_cpu((iocb)->u.isp2x.target.extended) \ @@ -244,6 +243,7 @@ struct ctio_to_2xxx { #ifndef CTIO_RET_TYPE #define CTIO_RET_TYPE 0x17 /* CTIO return entry */ #define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */ +#endif struct fcp_hdr { uint8_t r_ctl; -- 2.30.1