Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp704259pxu; Thu, 15 Oct 2020 14:29:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvLNb6UEHyETGbiB2g+S7rEga5n3jMMlJ4ymXNlqERHGie+8VDvxqmGwqVdShDmwa9tSW+ X-Received: by 2002:a17:906:cc4d:: with SMTP id mm13mr360894ejb.330.1602797355103; Thu, 15 Oct 2020 14:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602797355; cv=none; d=google.com; s=arc-20160816; b=Rxc9ojP141SrG2/KeUwj9NG0bPaJB0Ep6rnw1DagPVQf2bnKpjm8zm+MzPcMP2Ioy+ O6POv7D/g6eGBDM3u3e81Y1JTpZTVYaLKaybc1I70cdhVffRKMOkkowspFmSJxHYiTiq fcg7Pxng2rW82sKoNOnX22c/m34mM2FKL2dUMQXxOfF0t6nmyo8ThLCiopru1GZSuQjB 1PylIsjuCm8fMvZHoD8AyEb0twLhV1Kc79CFsS0EqFbPi5zuejrjFTfpiaKf70KuhuFL MZCvNedZgTLeGwoYZMB2/hTG7UjWp8ibSsdWsRa2DrPSGh+fCBEwDldieT2kKrczjdRd HNVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:to:from:date:dkim-signature; bh=XN9H2NxW6U+e1Qg/wOmyXlcxurDEZ/tcQC1sO6RyP+k=; b=sIn74IiXVcxmgiaoamBQGqVaaKb4zS6P8fhteoRW8+ryGUCiADIT9WAaSTGaK7Qz2+ 2QLy3iDDu51cMx656pcu4cSaBtMlDEPZyrW6+Xo1bRTB66irFgkkSS9ZQxSeD4D/v+jP hAD6K4ahmLhOzYMeU5X13lTobHDcxmHtXLRMwx9rxBonTa7ho9Akv2qaw2dCYTxQMoC1 ckwMdF32i/4tiFjvUF4aRfAe5VKl+3UdYCuyuvGpHHOnxfdPb5CL1Sqvaq/Pt2TCFOIl kFViFC0uLAsSpl3ftgDl4R9TE/+aXCNLVSL7qJi0gP4RqY6MpZNYLLXODomXrdTcOaow dVgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="mT98cD3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g3si133959ejx.529.2020.10.15.14.28.52; Thu, 15 Oct 2020 14:29:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b="mT98cD3/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726137AbgJORqT (ORCPT + 99 others); Thu, 15 Oct 2020 13:46:19 -0400 Received: from m12-12.163.com ([220.181.12.12]:55526 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbgJORqT (ORCPT ); Thu, 15 Oct 2020 13:46:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=XN9H2 NxW6U+e1Qg/wOmyXlcxurDEZ/tcQC1sO6RyP+k=; b=mT98cD3/kTxfYXfjTD9J2 6kKF9FWRalRzyDAgJezJoix2UPMoGiF7G/H7okemV6TFSgOwOpe1qCcoTLOlp9Ay VtxInKaN9UMa4BgtXXa8m3hFFUBPYAB1yWtqmg9JUhgRB4OFyYqlvGt8PixaQepr 01AIWU4HzE3PoIAVw+JRvw= Received: from localhost (unknown [101.228.30.83]) by smtp8 (Coremail) with SMTP id DMCowAB3nwS4ZYhfVlTERw--.36972S2; Thu, 15 Oct 2020 23:07:36 +0800 (CST) Date: Thu, 15 Oct 2020 23:07:36 +0800 From: Hui Su To: akpm@linux-foundation.org, daniel.m.jordan@oracle.com, walken@google.com, vbabka@suse.cz, ldufour@linux.ibm.com, arnd@arndb.de, sh_def@163.com, linux-kernel@vger.kernel.org Subject: [PATCH] acct.c: use #elif instead of #end and #elif Message-ID: <20201015150736.GA91603@rlk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CM-TRANSID: DMCowAB3nwS4ZYhfVlTERw--.36972S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFy3KryUGw4UGw1UJF1fWFg_yoW3ZFg_ua 1Fqr18CF15Ar1rAr929ws5ArWfW3y8XF4v9w17Kay7Za1DAwn5Xw1DArn293sa9397GFy3 urn8CFnxGrn2yjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRi1CJJUUUUU== X-Originating-IP: [101.228.30.83] X-CM-SenderInfo: xvkbvvri6rljoofrz/1tbiIBi+X10TBw9RrAAAsi Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use #elif instead of #end and #elif. Signed-off-by: Hui Su --- kernel/acct.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/acct.c b/kernel/acct.c index b0c5b3a9f5af..24681372af07 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -381,9 +381,7 @@ static comp2_t encode_comp2_t(u64 value) return (value & (MAXFRACT2>>1)) | (exp << (MANTSIZE2-1)); } } -#endif - -#if ACCT_VERSION == 3 +#elif ACCT_VERSION == 3 /* * encode an u64 into a 32 bit IEEE float */ @@ -500,8 +498,7 @@ static void do_acct_process(struct bsd_acct_struct *acct) /* backward-compatible 16 bit fields */ ac.ac_uid16 = ac.ac_uid; ac.ac_gid16 = ac.ac_gid; -#endif -#if ACCT_VERSION == 3 +#elif ACCT_VERSION == 3 { struct pid_namespace *ns = acct->ns; -- 2.25.1