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 73D71C8300F for ; Wed, 2 Dec 2020 00:59:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1FC9D2084C for ; Wed, 2 Dec 2020 00:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727791AbgLBA6i (ORCPT ); Tue, 1 Dec 2020 19:58:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726619AbgLBA6h (ORCPT ); Tue, 1 Dec 2020 19:58:37 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 92DBEC0617A6 for ; Tue, 1 Dec 2020 16:57:57 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id w187so120076pfd.5 for ; Tue, 01 Dec 2020 16:57:57 -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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=n8uU7Gm98Aw702pheuqehG0wwI4hLJaOhU2U1RimF498Yi/yb0syqbKQm0huQp2ATO tvl09cds3mwP8d6EI5OYi6tdqFRvuc71+IzBC2hNnwkJnB+L9LiCG47GOoebWcaI76sc tY+qe9UMNP2K31CeclwgevZvi6PJdab4za7oNjNK+fKuV7sfvZJBrCrlzPRJxePpUYlw d5HZ396BrLyE3HWGXTsdiz5iJhVTPSjNGLKKpQEJo8yeiKVz4txfra6gTOfkoj6c/mdJ e7n8F1tlt4YR1mUp+fJfUrqUkvLc0jXxRCQkd1gDXOBLjhwyVShgFVKozDmfToBvR6u6 bHRw== 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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=MintsAg/UOePKeAJ1PdbS+llDp4AaBlWDnippX38KTv+HIxzruChWYodLY3TEGanrq 0g6Km5P33TAtd14wqVuPE8mvoomKrzlgAwjOx44JueGfEO9mJsOhdnmK5ANOw5puz4sl ZkSZZitZaOLYambNMcmIsPqwgRYo+AiXLzZwjcD706mQWsGmVc7cBGypPzhRB7HctvaB YiesAfXd83p4GP85zVR4SP6OQKQLlqr8ZdkI9BX62kENTPO/MY4VgLkDtj8hlLeasr+n tH+nx+3+XfWUsfh4Fp6V7w1BJTyiEzr7xkfhAjhqyHidzeTYqZ2tAFsn0tAbJsgHP6ZY EX0A== X-Gm-Message-State: AOAM530gQAXTgEBkuwDMeX++QgAXYMianwkR8u3hveBMh1AbJkgEQATx h/C8FnVAqtg8oxd3sdXgayY= X-Google-Smtp-Source: ABdhPJyheiTIWEd+j1RQTi2m/mMn5TLRQxceVMkmfi1PMDTfXt7JHGZmGBZtho9hqE/cVuOhY+5ucg== X-Received: by 2002:aa7:9429:0:b029:197:f974:c989 with SMTP id y9-20020aa794290000b0290197f974c989mr69046pfo.30.1606870677134; Tue, 01 Dec 2020 16:57:57 -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 gz2sm116974pjb.2.2020.12.01.16.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 16:57:56 -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: Wed, 2 Dec 2020 08:57:22 +0800 Message-Id: <20201202005724.691458-2-robinh3123@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog In-Reply-To: <20201202005724.691458-1-robinh3123@gmail.com> References: <20201202005724.691458-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.454.gaff20da3a2-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 C5588C64E90 for ; Wed, 2 Dec 2020 00:58:15 +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 5503E2076C for ; Wed, 2 Dec 2020 00:58:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5503E2076C 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 1kkGTF-0007sP-4o; Wed, 02 Dec 2020 00:58:13 +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 1kkGTE-0007s0-4k for linux-f2fs-devel@lists.sourceforge.net; Wed, 02 Dec 2020 00:58:12 +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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=JSdVluGmYh29p63zGAetWxHCn4 8I1yrx9EMLbthYqUDgRz9hvhd7a9JPnzuSpprXWkGn1IzAlxXWxBqvGY1QfHS/otVRmpmfKyma/9Y mpOFb+yrjfJdU5fA/YDeVe/lkpfvBtQD+EYWaT5Zo67D+/hKx6qiJOWh7K4SEeEqCxNM=; 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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=ANrJnHQ5xcFcO16l44C0REkh9G 4ALrodmeJlGR0z0ID1+ddevnJLkbSUULVXNu0q7lGYMhrneZ8hw0IJGi29NC5csg3/YQlW9P+RiRj VNqTkKTXomguRodtcukJyx5/eQ6R4mgU/nCqOiynbj/lDNryrDZL/hFe20dfyuIFxx88=; Received: from mail-pg1-f174.google.com ([209.85.215.174]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.92.2) id 1kkGT4-00ACO6-UF for linux-f2fs-devel@lists.sourceforge.net; Wed, 02 Dec 2020 00:58:11 +0000 Received: by mail-pg1-f174.google.com with SMTP id f17so15505pge.6 for ; Tue, 01 Dec 2020 16:58:02 -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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=n8uU7Gm98Aw702pheuqehG0wwI4hLJaOhU2U1RimF498Yi/yb0syqbKQm0huQp2ATO tvl09cds3mwP8d6EI5OYi6tdqFRvuc71+IzBC2hNnwkJnB+L9LiCG47GOoebWcaI76sc tY+qe9UMNP2K31CeclwgevZvi6PJdab4za7oNjNK+fKuV7sfvZJBrCrlzPRJxePpUYlw d5HZ396BrLyE3HWGXTsdiz5iJhVTPSjNGLKKpQEJo8yeiKVz4txfra6gTOfkoj6c/mdJ e7n8F1tlt4YR1mUp+fJfUrqUkvLc0jXxRCQkd1gDXOBLjhwyVShgFVKozDmfToBvR6u6 bHRw== 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=KGoXkB/firHSerlRwS3YRy335L2aZrXOoUmu7edbdqo=; b=fa/G9iXvD6ISQgEVEsS8EcsQEY/zr8Ev2nT6fQI0szMnO9AFgLm7wucoYknOt+/SjE zfRRtsrpvdHlVVzafAKyppEzRVTQ4OfhOVt3CtBsTx1T71pj4zr8HqLamazSsguUsQ2d cWxJqPLxUtx94hYgRQy3Vy40YhRLqYbmrUYoyi6wUTJxq0Wtt9Cxt2laQd0f8WuqIPyc 02BRSaz6OFEh0g+mdvsfPyVpn7grC8+EF3gXFJVI59t5lpzmR91VxdStyetSWqChc/Ls 4pWmct3yJJ69A0j7tM+ZmTUZ9Z5lrxg4n/i7U7GgS/mWWhtbty6sT5ScmJ1MKv8oG8YY 6L+g== X-Gm-Message-State: AOAM532zBxU0lYuUX5sy8Hdzd0NMzbBG7qE1v0/RAS7cq3EAAnLd2mNz nOXbONmYAZNO7p0+ZaN3w7JrbP6BodM= X-Google-Smtp-Source: ABdhPJyheiTIWEd+j1RQTi2m/mMn5TLRQxceVMkmfi1PMDTfXt7JHGZmGBZtho9hqE/cVuOhY+5ucg== X-Received: by 2002:aa7:9429:0:b029:197:f974:c989 with SMTP id y9-20020aa794290000b0290197f974c989mr69046pfo.30.1606870677134; Tue, 01 Dec 2020 16:57:57 -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 gz2sm116974pjb.2.2020.12.01.16.57.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 16:57:56 -0800 (PST) From: Robin Hsu To: linux-f2fs-devel@lists.sourceforge.net, jaegeuk@kernel.org, chao@kernel.org Date: Wed, 2 Dec 2020 08:57:22 +0800 Message-Id: <20201202005724.691458-2-robinh3123@gmail.com> X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog In-Reply-To: <20201202005724.691458-1-robinh3123@gmail.com> References: <20201202005724.691458-1-robinh3123@gmail.com> MIME-Version: 1.0 X-Headers-End: 1kkGT4-00ACO6-UF 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.454.gaff20da3a2-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel