From patchwork Mon Oct 9 04:47:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 13412935 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C46A4E95A8E for ; Mon, 9 Oct 2023 04:47:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345073AbjJIEr3 (ORCPT ); Mon, 9 Oct 2023 00:47:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345066AbjJIEr2 (ORCPT ); Mon, 9 Oct 2023 00:47:28 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DF18A4 for ; Sun, 8 Oct 2023 21:47:26 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E75D51F38C for ; Mon, 9 Oct 2023 04:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1696826844; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OkuFGR+HFVavMC5o9pG6m1aw6ZKLc8DP5zLr+vCWvUo=; b=n/BD9+MUD6ElCEAFLT10MhdDpn3mQHjeW6+/iIiE/MDo9LMkDVkI/HTEEoRnCkhL0nkS/O 0gr2uiPfayxKMQ9ChO7en93Bxz+X72qx22XHhDf+Z19uzOjgCydTIwe9rVWGOlLXScTs4e GJXP8eTU0P6M7b1ykJCIu/BpTiQ1NkU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id BCA0313586 for ; Mon, 9 Oct 2023 04:47:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id iFR6F9uFI2VSVQAAMHmgww (envelope-from ) for ; Mon, 09 Oct 2023 04:47:23 +0000 From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH 2/2] btrfs-progs: move inode cache removal to rescue group Date: Mon, 9 Oct 2023 15:17:00 +1030 Message-ID: <1d5cc97d664fc10c0244ff2c255f2fc4bbf58dfa.1696826531.git.wqu@suse.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The option "--clear-ino-cache" is not really that suitable for "btrfs check" group. Let's move it to "btrfs rescue" group to fix those small hiccups, just like the existing "btrfs rescue fix-device-size" command. For now, "btrfs check --clear-ino-cache" would still work, with one extra warning referring to "btrfs rescue clear-ino-cache". This is mostly to reduce the surprise, and keep script users (I doubt if there is any though) happy for now. In the next or two releases, we would fully remove the support in "btrfs check" group. Another small change is, in the documents, we refer to the feature as "inode map", which doesn't match with the mount option documents. Since we're here, unify them to "inode cache" feature. Issue: #669 Signed-off-by: Qu Wenruo --- Documentation/btrfs-check.rst | 5 +++- Documentation/btrfs-rescue.rst | 6 ++++ check/main.c | 1 + cmds/rescue.c | 52 ++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/Documentation/btrfs-check.rst b/Documentation/btrfs-check.rst index cf8de9fcc888..3c5f96f1951f 100644 --- a/Documentation/btrfs-check.rst +++ b/Documentation/btrfs-check.rst @@ -84,8 +84,11 @@ SAFE OR ADVISORY OPTIONS See also the *clear_cache* mount option. --clear-ino-cache - remove leftover items pertaining to the deprecated inode map feature + remove leftover items pertaining to the deprecated `inode cache` feature + .. warning:: + This option is deprecated, please use `btrfs rescue clear-ino-cache` + instead, this option would be removed in the future eventually. DANGEROUS OPTIONS ----------------- diff --git a/Documentation/btrfs-rescue.rst b/Documentation/btrfs-rescue.rst index 39d250cefa48..e99aa4ad8a7e 100644 --- a/Documentation/btrfs-rescue.rst +++ b/Documentation/btrfs-rescue.rst @@ -50,6 +50,12 @@ fix-device-size WARNING: CPU: 3 PID: 439 at fs/btrfs/ctree.h:1559 btrfs_update_device+0x1c5/0x1d0 [btrfs] +clear-ino-cache + Remove leftover items pertaining to the deprecated `inode cache` feature. + + The `inode cache` feature (enabled by mount option "inode_cache") is + fully removed in v5.11 kernel. + clear-uuid-tree Clear UUID tree, so that kernel can re-generate it at next read-write mount. diff --git a/check/main.c b/check/main.c index 1174939fd6eb..7760511b85d9 100644 --- a/check/main.c +++ b/check/main.c @@ -10242,6 +10242,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv) } if (clear_ino_cache) { + warning("--clear-ino-cache option is deprecated, please use \"btrfs rescue clear-ino-cache\" instead.") ret = clear_ino_cache_items(gfs_info); err = ret; goto close_out; diff --git a/cmds/rescue.c b/cmds/rescue.c index be6f5016d5a9..38f4e1423434 100644 --- a/cmds/rescue.c +++ b/cmds/rescue.c @@ -34,6 +34,7 @@ #include "common/utils.h" #include "common/help.h" #include "common/open-utils.h" +#include "common/clear-cache.h" #include "cmds/commands.h" #include "cmds/rescue.h" @@ -405,6 +406,56 @@ out: } static DEFINE_SIMPLE_COMMAND(rescue_clear_uuid_tree, "clear-uuid-tree"); +static const char * const cmd_rescue_clear_ino_cache_usage[] = { + "btrfs rescue clear-ino-cache ", + "remove leftover items pertaining to the deprecated inode cache feature", + NULL +}; + +static int cmd_rescue_clear_ino_cache(const struct cmd_struct *cmd, + int argc, char **argv) +{ + struct open_ctree_args oca = { 0 }; + struct btrfs_fs_info *fs_info; + char *devname; + int ret; + + clean_args_no_options(cmd, argc, argv); + + if (check_argc_exact(argc, 2)) + return 1; + + devname = argv[optind]; + ret = check_mounted(devname); + if (ret < 0) { + errno = -ret; + error("could not check mount status: %m"); + goto out; + } else if (ret) { + error("%s is currently mounted", devname); + ret = -EBUSY; + goto out; + } + oca.filename = devname; + oca.flags = OPEN_CTREE_WRITES; + fs_info = open_ctree_fs_info(&oca); + if (!fs_info) { + error("could not open btrfs"); + ret = -EIO; + goto out; + } + ret = clear_ino_cache_items(fs_info); + if (ret < 0) { + errno = -ret; + error("failed to clear ino cache: %m"); + } else { + pr_verbose(LOG_DEFAULT, "Successfully cleared ino cache"); + } +out: + return !!ret; +} +static DEFINE_SIMPLE_COMMAND(rescue_clear_ino_cache, "clear-ino-cache"); + static const char rescue_cmd_group_info[] = "toolbox for specific rescue operations"; @@ -416,6 +467,7 @@ static const struct cmd_group rescue_cmd_group = { &cmd_struct_rescue_fix_device_size, &cmd_struct_rescue_create_control_device, &cmd_struct_rescue_clear_uuid_tree, + &cmd_struct_rescue_clear_ino_cache, NULL } };