From patchwork Mon Nov 28 23:32:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 26978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp11817wrr; Mon, 28 Nov 2022 15:51:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6N9wt74+hJwlXq2WcJaTsIVjiD+xVfoy7aeUpw7ewHfZI/H+B+bjVZnGb2QEZOPrS4L3S/ X-Received: by 2002:aa7:d4d0:0:b0:46b:46ab:c67f with SMTP id t16-20020aa7d4d0000000b0046b46abc67fmr5223476edr.51.1669679500771; Mon, 28 Nov 2022 15:51:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669679500; cv=none; d=google.com; s=arc-20160816; b=J0qFZZ6lKzi15/FWEAfEksmefDh5xiArqSPvL/UrmvJ8D7nKth5xTTUvg+kPakQrxt OCAogKcGXU8E/cd431i9GSud/5Ek4AQ8XRp6aDJcnkwS0f99MCmHcb6bKpWCuZH1iNxx HlAIV0NsHdIiOaofuzlTPr84cMjfmwU0+mOu3Vzci6izydcmiA/o94Jfqx8rq40gLRlP xjNQJ6hBIXZPkYsNMdGdCiU7Ke78WwuNGZq1wcUi2mqBcXESseloqQM1BfK/YRwcnKSd TfzVaPx62sXqh+H+VEZHeTb5cxYqTYY2cmx9bwOMjJRmO5/3rgKN+ECKrzjGgsmyEBBb 9/cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=/t0m8W7cywAXfbUupFc1l3jD+RdKcgigtCWSdR60M3o=; b=bAcL/pZY/LvERPzozZRO/8UiNYP7Xp/aoI1C9WEG4j7uXNc7l828e+SKXcnNG1SAhq g3pwkQ1BcTUXb7UbXZIFIOaemtURfxMdxepxunYzWJH2nKzD3I/cp3m82784b/VtUs2+ 7dbXV+VVRWmEoA79i5lCRFRCMqBdDDn3IEeSODj4hFs5wf8qNO2GTUY4zPvTujBSN2pu ud031Ur5N5vEvHb+Nf4mfbObbaxmb1kDhaDFhZdZyM6RocyLpvysuwM3V9bUVgKxqbIT bWt00Q/bWJniGugsPs7jBNVZ+qvmCpHsmJd3yg0DtuWoE76d6mOr03PsFAkrVGdIGOJj q5Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="V82mG/53"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm21-20020a170907949500b0078dc5b2b6c4si12042804ejc.666.2022.11.28.15.51.17; Mon, 28 Nov 2022 15:51:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="V82mG/53"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234773AbiK1Xm0 (ORCPT + 99 others); Mon, 28 Nov 2022 18:42:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbiK1XmY (ORCPT ); Mon, 28 Nov 2022 18:42:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4E6225C; Mon, 28 Nov 2022 15:42:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5AD79B80FE9; Mon, 28 Nov 2022 23:42:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07353C433D7; Mon, 28 Nov 2022 23:42:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669678940; bh=yKpU+kv6QFrmTXdVvxt3iUQATsh8YTBkD/9P1+GJlMU=; h=From:To:Cc:Subject:Date:From; b=V82mG/53V9AIcSMGKP7eGAs8NHsK9xRejCZjV0PK9WG1IF/Oyvg3TuQ3p+ykjEjzm plP90VkSzNBsAdM32GfTtOVp1+JejfMjSVMpnwol7Qv1F/34O4RsT2dHcYEkYVYMSS oml1PPbNYJ/+LuDHt0CjYXtZbhxe42rLEt3Ay8tQChiNS9/DJo/+1ctBgGq+BfgnF4 uysjQHxtR6WPcphVXYSXwkSEiNxCNNTRkuS/qjSmOj3d/LnFUJ7RJu+Aeq+SYCwBiT BB+m8wLVyY7Mo7oetBpqN9SKHnXVnRsEUcUQtmK9d44HKLCq8wN+CrRHj6ypSoQqL4 DP+RLn38DRqPQ== From: Jisheng Zhang To: Alexander Viro , Ritesh Harjani Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] coredump: fix compile warning when ELF_CORE=n while COREDUMP=y Date: Tue, 29 Nov 2022 07:32:29 +0800 Message-Id: <20221128233229.3880-1-jszhang@kernel.org> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750749239546041878?= X-GMAIL-MSGID: =?utf-8?q?1750785852080817725?= fix below build warning when ELF_CORE=n while COREDUMP=y: fs/coredump.c:834:12: warning: ‘dump_emit_page’ defined but not used [-Wunused-function] 834 | static int dump_emit_page(struct coredump_params *cprm, struct page *page) | ^~~~~~~~~~~~~~ Fixes the warning by moving the definition of dump_emit_page() in the same #ifdef as of dump_user_range(), since dump_user_range() is the only caller of dump_emit_page(). Fixes: 06bbaa6dc53c ("[coredump] don't use __kernel_write() on kmap_local_page()") Signed-off-by: Jisheng Zhang Reviewed-by: Ritesh Harjani (IBM) --- fs/coredump.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) Since v1: - add Fixes tag - collect Reviewed-by - fix the warning by moving the definition of dump_emit_page() in the same #ifdef as of dump_user_range(). diff --git a/fs/coredump.c b/fs/coredump.c index 7bad7785e8e6..1fc8ecc0e8f6 100644 --- a/fs/coredump.c +++ b/fs/coredump.c @@ -831,6 +831,30 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr) } } +int dump_emit(struct coredump_params *cprm, const void *addr, int nr) +{ + if (cprm->to_skip) { + if (!__dump_skip(cprm, cprm->to_skip)) + return 0; + cprm->to_skip = 0; + } + return __dump_emit(cprm, addr, nr); +} +EXPORT_SYMBOL(dump_emit); + +void dump_skip_to(struct coredump_params *cprm, unsigned long pos) +{ + cprm->to_skip = pos - cprm->pos; +} +EXPORT_SYMBOL(dump_skip_to); + +void dump_skip(struct coredump_params *cprm, size_t nr) +{ + cprm->to_skip += nr; +} +EXPORT_SYMBOL(dump_skip); + +#ifdef CONFIG_ELF_CORE static int dump_emit_page(struct coredump_params *cprm, struct page *page) { struct bio_vec bvec = { @@ -864,30 +888,6 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page) return 1; } -int dump_emit(struct coredump_params *cprm, const void *addr, int nr) -{ - if (cprm->to_skip) { - if (!__dump_skip(cprm, cprm->to_skip)) - return 0; - cprm->to_skip = 0; - } - return __dump_emit(cprm, addr, nr); -} -EXPORT_SYMBOL(dump_emit); - -void dump_skip_to(struct coredump_params *cprm, unsigned long pos) -{ - cprm->to_skip = pos - cprm->pos; -} -EXPORT_SYMBOL(dump_skip_to); - -void dump_skip(struct coredump_params *cprm, size_t nr) -{ - cprm->to_skip += nr; -} -EXPORT_SYMBOL(dump_skip); - -#ifdef CONFIG_ELF_CORE int dump_user_range(struct coredump_params *cprm, unsigned long start, unsigned long len) {