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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,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 2E665C433FE for ; Tue, 8 Dec 2020 08:15:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0200323A52 for ; Tue, 8 Dec 2020 08:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728031AbgLHIPZ (ORCPT ); Tue, 8 Dec 2020 03:15:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727527AbgLHIPY (ORCPT ); Tue, 8 Dec 2020 03:15:24 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C7EDC0613D6 for ; Tue, 8 Dec 2020 00:14:44 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id e2so3168886pgi.5 for ; Tue, 08 Dec 2020 00:14:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=LYcl97eWcyp36GTTmFA630p01xUrXCDfNOigwz2I/OMi9Yi/XnQ12k2r5aXhgo+AN9 3ZsxxLEDUjkNhZe4t4GXT7ForPbCasMHNakE1GinbIjV5uzN4I4XXndGh80RsoMd8sIU pp79PgS8q4g/U5jnDM+StBZewDvDaW4s/ffbn/LT/w6rcsg1Ojn1dl0pVjw+hO+PNkCF FY7I5lF7JmEt2e4DzZie82mYQf6zuItUD4z6gKx2w1j6kjcvUvwWm0tiOePplMF8gMQ8 ReCaD/kZDZKnKoY1SRcZG4Wm11U5TUa4uZyMLKF9vjb2ali+rGWxsS21o1vT5lyk39E9 lJ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=lN0U9HNkW39AD3eRz4BrTMXeYS1a2VrZBFeeqzRF9IJN1pclEqqMNOIxsesrKt6Sra rbw4DudpDCHMSi2d/YeuMnthIykAvK3FhAr0JiymE94n3kpgpRbk/cJbCOCNdlASEJp6 JuyevSTF64kzvVj1xzohpx3ja4a0jke8dfKkn9M+tx0FGllWHsmqiWZEkXnRaxQiBQL7 cblq9qw865LzQkGwfDAqE0fFp5rU69VXauaPSVwmRDf2wYpOtOlt4aJc3cUvpbEEalWD 3ZYn+gIapCcXpJFq3yf94j5FIiAvr773LfV6b52zF2r2XYkHpav4JNmBIG8I6EjlAVDM IfQQ== X-Gm-Message-State: AOAM532sVwyzve13L3vj5GDBmfWY/+5U7Gsseyjkwb4kt1PuM/NXiYt3 JrMXF8vEOD+1Lz8t+3Nl4cA= X-Google-Smtp-Source: ABdhPJxBXk46n3SDMmXeBCsRrmKRkx57VGxxBE11dFj+he8rrDP78jbjlA1yj3fZvOLON/zq+wz/zg== X-Received: by 2002:a17:90a:3cc6:: with SMTP id k6mr3193611pjd.204.1607415284080; Tue, 08 Dec 2020 00:14:44 -0800 (PST) Received: from robinhsu-p520.ntc.corp.google.com ([2401:fa00:fc:202:1ea0:b8ff:fe77:fe45]) by smtp.gmail.com with ESMTPSA id 19sm2665387pfu.85.2020.12.08.00.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 00:14:43 -0800 (PST) From: Robin Hsu To: linux-f2fs-devel@lists.sourceforge.net, jaegeuk@kernel.org, chao@kernel.org Cc: linux-kernel@vger.kernel.org, Robin Hsu Subject: [PATCH 1/3] f2fs-tools: Added #ifdef WITH_func Date: Tue, 8 Dec 2020 16:13:42 +0800 Message-Id: <20201208081344.652430-2-robinh3123@gmail.com> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201208081344.652430-1-robinh3123@gmail.com> References: <20201208081344.652430-1-robinh3123@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robin Hsu Add proprocessor defines (options) 'WITH_func', where func = DUMP, DEFRAG, RESIZE, or SLOAD Signed-off-by: Robin Hsu --- fsck/main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fsck/main.c b/fsck/main.c index e70048b..b20498f 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -345,6 +345,7 @@ void f2fs_parse_options(int argc, char *argv[]) break; } } else if (!strcmp("dump.f2fs", prog)) { +#ifdef WITH_DUMP const char *option_string = "d:i:n:s:Sa:b:V"; static struct dump_option dump_opt = { .nid = 0, /* default root ino */ @@ -426,7 +427,9 @@ void f2fs_parse_options(int argc, char *argv[]) } c.private = &dump_opt; +#endif } else if (!strcmp("defrag.f2fs", prog)) { +#ifdef WITH_DEFRAG const char *option_string = "d:s:Sl:t:iV"; c.func = DEFRAG; @@ -484,7 +487,9 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif } else if (!strcmp("resize.f2fs", prog)) { +#ifdef WITH_RESIZE const char *option_string = "d:st:iV"; c.func = RESIZE; @@ -526,7 +531,9 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif } else if (!strcmp("sload.f2fs", prog)) { +#ifdef WITH_SLOAD const char *option_string = "C:d:f:p:s:St:T:V"; #ifdef HAVE_LIBSELINUX int max_nr_opt = (int)sizeof(c.seopt_file) / @@ -595,6 +602,7 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif /* WITH_SLOAD */ } if (err == NOERROR) { @@ -707,6 +715,7 @@ static int do_fsck(struct f2fs_sb_info *sbi) return FSCK_ERRORS_LEFT_UNCORRECTED; } +#ifdef WITH_DUMP static void do_dump(struct f2fs_sb_info *sbi) { struct dump_option *opt = (struct dump_option *)c.private; @@ -733,7 +742,9 @@ static void do_dump(struct f2fs_sb_info *sbi) print_cp_state(flag); } +#endif +#ifdef WITH_DEFRAG static int do_defrag(struct f2fs_sb_info *sbi) { struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); @@ -782,7 +793,9 @@ out_range: c.defrag_target); return -1; } +#endif +#ifdef WITH_RESIZE static int do_resize(struct f2fs_sb_info *sbi) { if (!c.target_sectors) @@ -796,7 +809,9 @@ static int do_resize(struct f2fs_sb_info *sbi) return f2fs_resize(sbi); } +#endif +#ifdef WITH_SLOAD static int do_sload(struct f2fs_sb_info *sbi) { if (!c.from_dir) { @@ -808,6 +823,7 @@ static int do_sload(struct f2fs_sb_info *sbi) return f2fs_sload(sbi); } +#endif #if defined(__APPLE__) static u64 get_boottime_ns() -- 2.29.2.576.ga3fc446d84-goog 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 8560CC433FE for ; Tue, 8 Dec 2020 08:15:00 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D8C523A51 for ; Tue, 8 Dec 2020 08:14:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2D8C523A51 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1kmY9C-0007dy-8a; Tue, 08 Dec 2020 08:14:58 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmY95-0007dc-Mo for linux-f2fs-devel@lists.sourceforge.net; Tue, 08 Dec 2020 08:14:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=UJdbPT6jbXOB1cmMQ42g/XiIES ZeDl1KKpSheAG0z+YYMMYpQwiVm+eURhGqCi/EqWurLEwy5am957H3c6tvQ1Ze03CvEcTIbtvgjps zONP2NdBDM9xBlIhrEac6rkowE0zPz/044yoWhF9Ad4pQp/FhXA/cYL+qk+0P2b8swrk=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=YAvjzGobADVmBXirIIAEQmFHQX C9PYbwx+Z62mDJY2AI56x8bM8+xbn2FknXS8aB0RCbMpexDxzhgGnL3k71nYG5ykIkCdMCQwZZYWr s8eBPwaeoF0UAlZ/ScZ3qJF2cnFrQvLiSD9ksasD2Wm+/E3mLA2vhZmktPmz9/sW4ONI=; Received: from mail-pf1-f171.google.com ([209.85.210.171]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kmY93-0039ya-P4 for linux-f2fs-devel@lists.sourceforge.net; Tue, 08 Dec 2020 08:14:51 +0000 Received: by mail-pf1-f171.google.com with SMTP id q22so13162435pfk.12 for ; Tue, 08 Dec 2020 00:14:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=LYcl97eWcyp36GTTmFA630p01xUrXCDfNOigwz2I/OMi9Yi/XnQ12k2r5aXhgo+AN9 3ZsxxLEDUjkNhZe4t4GXT7ForPbCasMHNakE1GinbIjV5uzN4I4XXndGh80RsoMd8sIU pp79PgS8q4g/U5jnDM+StBZewDvDaW4s/ffbn/LT/w6rcsg1Ojn1dl0pVjw+hO+PNkCF FY7I5lF7JmEt2e4DzZie82mYQf6zuItUD4z6gKx2w1j6kjcvUvwWm0tiOePplMF8gMQ8 ReCaD/kZDZKnKoY1SRcZG4Wm11U5TUa4uZyMLKF9vjb2ali+rGWxsS21o1vT5lyk39E9 lJ0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=X1Fz0yq5QOWZGHX6crMbhCYX2GPoKckcY3/RN3rhSp8=; b=HF/VnG6g/y90RGbJCEo8vdHmWFaetJBpfpI4rqDI5Sk5TLL30P2cE+7q8K4dSykp1o hTQX9sc9A8woML+XKAF+L25PPDsh38CpohSltlV2DoCwtp2VNBJgxtt8ApN5MkAQndyf vVoss1yqg9zd/yYWW/vjp7hJ+nfZaYg05dmi44f4ngD+5rC+AGCjLvYPVrrz6T37Tmza PWrlDv+jCZphQTKP6/prH1Cu4c/UEXlq6rWqH/5w6Dl0jvPhqmFecioz/vMX/lGjjEFo fF0efqGrQ9pKQQ2RWOe7VtFIo/hs0A9WuKNNOdBh0oNKB7OnSiNfrzC81PnHnyIt6v6+ Ogwg== X-Gm-Message-State: AOAM532rgVL2EcUKUFsCNGScC4SThYjT/Q+MAj/Rn9+LmLGBvUUDCPTW Iza/SXcnBJTHXq8NISHY/llepumlQIE= X-Google-Smtp-Source: ABdhPJxBXk46n3SDMmXeBCsRrmKRkx57VGxxBE11dFj+he8rrDP78jbjlA1yj3fZvOLON/zq+wz/zg== X-Received: by 2002:a17:90a:3cc6:: with SMTP id k6mr3193611pjd.204.1607415284080; Tue, 08 Dec 2020 00:14:44 -0800 (PST) Received: from robinhsu-p520.ntc.corp.google.com ([2401:fa00:fc:202:1ea0:b8ff:fe77:fe45]) by smtp.gmail.com with ESMTPSA id 19sm2665387pfu.85.2020.12.08.00.14.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 00:14:43 -0800 (PST) From: Robin Hsu To: linux-f2fs-devel@lists.sourceforge.net, jaegeuk@kernel.org, chao@kernel.org Date: Tue, 8 Dec 2020 16:13:42 +0800 Message-Id: <20201208081344.652430-2-robinh3123@gmail.com> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201208081344.652430-1-robinh3123@gmail.com> References: <20201208081344.652430-1-robinh3123@gmail.com> MIME-Version: 1.0 X-Headers-End: 1kmY93-0039ya-P4 Subject: [f2fs-dev] [PATCH 1/3] f2fs-tools: Added #ifdef WITH_func X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net From: Robin Hsu Add proprocessor defines (options) 'WITH_func', where func = DUMP, DEFRAG, RESIZE, or SLOAD Signed-off-by: Robin Hsu --- fsck/main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/fsck/main.c b/fsck/main.c index e70048b..b20498f 100644 --- a/fsck/main.c +++ b/fsck/main.c @@ -345,6 +345,7 @@ void f2fs_parse_options(int argc, char *argv[]) break; } } else if (!strcmp("dump.f2fs", prog)) { +#ifdef WITH_DUMP const char *option_string = "d:i:n:s:Sa:b:V"; static struct dump_option dump_opt = { .nid = 0, /* default root ino */ @@ -426,7 +427,9 @@ void f2fs_parse_options(int argc, char *argv[]) } c.private = &dump_opt; +#endif } else if (!strcmp("defrag.f2fs", prog)) { +#ifdef WITH_DEFRAG const char *option_string = "d:s:Sl:t:iV"; c.func = DEFRAG; @@ -484,7 +487,9 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif } else if (!strcmp("resize.f2fs", prog)) { +#ifdef WITH_RESIZE const char *option_string = "d:st:iV"; c.func = RESIZE; @@ -526,7 +531,9 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif } else if (!strcmp("sload.f2fs", prog)) { +#ifdef WITH_SLOAD const char *option_string = "C:d:f:p:s:St:T:V"; #ifdef HAVE_LIBSELINUX int max_nr_opt = (int)sizeof(c.seopt_file) / @@ -595,6 +602,7 @@ void f2fs_parse_options(int argc, char *argv[]) if (err != NOERROR) break; } +#endif /* WITH_SLOAD */ } if (err == NOERROR) { @@ -707,6 +715,7 @@ static int do_fsck(struct f2fs_sb_info *sbi) return FSCK_ERRORS_LEFT_UNCORRECTED; } +#ifdef WITH_DUMP static void do_dump(struct f2fs_sb_info *sbi) { struct dump_option *opt = (struct dump_option *)c.private; @@ -733,7 +742,9 @@ static void do_dump(struct f2fs_sb_info *sbi) print_cp_state(flag); } +#endif +#ifdef WITH_DEFRAG static int do_defrag(struct f2fs_sb_info *sbi) { struct f2fs_super_block *sb = F2FS_RAW_SUPER(sbi); @@ -782,7 +793,9 @@ out_range: c.defrag_target); return -1; } +#endif +#ifdef WITH_RESIZE static int do_resize(struct f2fs_sb_info *sbi) { if (!c.target_sectors) @@ -796,7 +809,9 @@ static int do_resize(struct f2fs_sb_info *sbi) return f2fs_resize(sbi); } +#endif +#ifdef WITH_SLOAD static int do_sload(struct f2fs_sb_info *sbi) { if (!c.from_dir) { @@ -808,6 +823,7 @@ static int do_sload(struct f2fs_sb_info *sbi) return f2fs_sload(sbi); } +#endif #if defined(__APPLE__) static u64 get_boottime_ns() -- 2.29.2.576.ga3fc446d84-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel