Skip to content

Commit ff9464a

Browse files
committed
btrfs-progs: check: remove --clear-ino-cache option
The inode_cache functionality is long gone and the 'rescue' group provides the clearning functionality, no point keeping it in check. Move the --clear-space-cache option to the deprecaeted section so it can be removed soon. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent f742e23 commit ff9464a

File tree

2 files changed

+10
-24
lines changed

2 files changed

+10
-24
lines changed

Documentation/btrfs-check.rst

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,6 @@ SAFE OR ADVISORY OPTIONS
9292
This can be used to use a different starting point if some of the primary
9393
superblock is damaged.
9494

95-
--clear-space-cache v1|v2
96-
completely remove the free space cache of the given version
97-
98-
See also the *clear_cache* mount option.
99-
100-
.. warning::
101-
This option is deprecated, please use `btrfs rescue clear-space-cache`
102-
instead, this option would be removed in the future eventually.
103-
10495
DANGEROUS OPTIONS
10596
-----------------
10697

@@ -140,15 +131,17 @@ DANGEROUS OPTIONS
140131
This option also skips the delay and warning in the repair mode (see
141132
*--repair*).
142133

143-
DEPRECATED OR MOVED OPTIONS
144-
---------------------------
134+
DEPRECATED OR REMOVED OPTIONS
135+
-----------------------------
136+
137+
--clear-space-cache v1|v2
138+
completely remove the free space cache of the given version
145139

146-
--clear-ino-cache
147-
(removed: 6.7)
140+
See also the *clear_cache* mount option.
148141

149-
remove leftover items pertaining to the deprecated *inode cache* feature,
150-
please use :ref:`btrfs rescue clear-ino-cache<man-rescue-clear-ino-cache>`
151-
instead
142+
.. warning::
143+
This option is deprecated, please use `btrfs rescue clear-space-cache`
144+
instead, this option would be removed in the future eventually.
152145

153146
EXIT STATUS
154147
-----------

check/main.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10092,7 +10092,6 @@ static const char * const cmd_check_usage[] = {
1009210092
OPTLINE("-p|--progress", "indicate progress"),
1009310093
"",
1009410094
"Deprecated or moved options:",
10095-
OPTLINE("--clear-ino-cache", "clear ino cache leftover items (moved to 'rescue' group)"),
1009610095
OPTLINE("--clear-space-cache v1|v2", "clear space cache for v1 or v2 (moved to 'rescue' group)"),
1009710096
NULL
1009810097
};
@@ -10127,7 +10126,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
1012710126
GETOPT_VAL_INIT_EXTENT, GETOPT_VAL_CHECK_CSUM,
1012810127
GETOPT_VAL_READONLY, GETOPT_VAL_CHUNK_TREE,
1012910128
GETOPT_VAL_MODE, GETOPT_VAL_CLEAR_SPACE_CACHE,
10130-
GETOPT_VAL_CLEAR_INO_CACHE, GETOPT_VAL_FORCE };
10129+
GETOPT_VAL_FORCE };
1013110130
static const struct option long_options[] = {
1013210131
{ "super", required_argument, NULL, 's' },
1013310132
{ "repair", no_argument, NULL, GETOPT_VAL_REPAIR },
@@ -10149,8 +10148,6 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
1014910148
GETOPT_VAL_MODE },
1015010149
{ "clear-space-cache", required_argument, NULL,
1015110150
GETOPT_VAL_CLEAR_SPACE_CACHE},
10152-
{ "clear-ino-cache", no_argument , NULL,
10153-
GETOPT_VAL_CLEAR_INO_CACHE},
1015410151
{ "force", no_argument, NULL, GETOPT_VAL_FORCE },
1015510152
{ NULL, 0, NULL, 0}
1015610153
};
@@ -10232,10 +10229,6 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
1023210229
}
1023310230
ctree_flags |= OPEN_CTREE_WRITES;
1023410231
break;
10235-
case GETOPT_VAL_CLEAR_INO_CACHE:
10236-
error("--clear-ino-cache option is deprecated, please use \"btrfs rescue clear-ino-cache\" instead");
10237-
exit(1);
10238-
break;
1023910232
case GETOPT_VAL_FORCE:
1024010233
force = 1;
1024110234
break;

0 commit comments

Comments
 (0)