From 5a87a95115a0f992ef4d3ef9ad480d8cf3bb27ec Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Tue, 27 Mar 2018 10:45:45 +0300 Subject: btrfs-progs: Remove deprecated btrfs-show-super Its function has been superseded by btrfs inspect-internal show-super. Furthermore the tools is currently not built by default. Just remove it. Deprecated since 4.8. Issue: #97 Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba --- .gitignore | 1 - Documentation/Makefile.in | 1 - Documentation/btrfs-select-super.asciidoc | 3 +-- Documentation/btrfs.asciidoc | 3 ++- Makefile | 3 +-- btrfs-show-super.c | 39 ------------------------------- 6 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 btrfs-show-super.c diff --git a/.gitignore b/.gitignore index c0f85fc4..06db51f3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ btrfs-convert btrfs-find-root btrfs-find-root.static btrfs-image -btrfs-show-super btrfs-corrupt-block btrfs-select-super btrfs-calc-size diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index ee32a50d..184647c4 100644 --- a/Documentation/Makefile.in +++ b/Documentation/Makefile.in @@ -102,7 +102,6 @@ install-man: man $(MV) $(DESTDIR)$(man5dir)/btrfs-man5.5.gz $(DESTDIR)$(man5dir)/btrfs.5.gz $(INSTALL) -m 644 $(GZ_MAN8) $(DESTDIR)$(man8dir) $(LN_S) -f btrfs-check.8.gz $(DESTDIR)$(man8dir)/btrfsck.8.gz - $(LN_S) -f btrfs-inspect-internal.8.gz $(DESTDIR)$(man8dir)/btrfs-show-super.8.gz uninstall: cd $(DESTDIR)$(man8dir); rm -f btrfs-check.8.gz $(GZ_MAN8) diff --git a/Documentation/btrfs-select-super.asciidoc b/Documentation/btrfs-select-super.asciidoc index 6e94a034..e3bca98b 100644 --- a/Documentation/btrfs-select-super.asciidoc +++ b/Documentation/btrfs-select-super.asciidoc @@ -21,8 +21,7 @@ The filesystem specified by 'device' must not be mounted. NOTE: *Prior to overwriting the primary superblock, please make sure that the backup copies are valid!* -To dump a superblock use the *btrfs inspect-internal -dump-super* command, or the obsolete command *btrfs-show-super*. +To dump a superblock use the *btrfs inspect-internal dump-super* command. Then run the check (in the non-repair mode) using the command *btrfs check -s* where '-s' specifies the superblock copy to use. diff --git a/Documentation/btrfs.asciidoc b/Documentation/btrfs.asciidoc index 62bbdb3f..7316ac09 100644 --- a/Documentation/btrfs.asciidoc +++ b/Documentation/btrfs.asciidoc @@ -122,7 +122,8 @@ Deprecated and obsolete tools: *btrfs-debug-tree*:: moved to *btrfs inspect-internal dump-tree*. Removed from source distribution. -*btrfs-show-super*:: moved to *btrfs inspect-internal dump-super* +*btrfs-show-super*:: moved to *btrfs inspect-internal dump-super*, standalone +removed. *btrfs-zero-log*:: moved to *btrfs rescue zero-log*, standalone removed. EXIT STATUS diff --git a/Makefile b/Makefile index 0da9ad2a..a63f70ec 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ progs_install = btrfs mkfs.btrfs btrfs-map-logical btrfs-image \ btrfs-select-super # other tools, not built by default -progs_extra = btrfs-fragments btrfs-calc-size btrfs-show-super +progs_extra = btrfs-fragments btrfs-calc-size progs_static = $(foreach p,$(progs),$(p).static) @@ -228,7 +228,6 @@ endif btrfs_convert_cflags = -DBTRFSCONVERT_EXT2=$(BTRFSCONVERT_EXT2) btrfs_convert_cflags += -DBTRFSCONVERT_REISERFS=$(BTRFSCONVERT_REISERFS) btrfs_fragments_libs = -lgd -lpng -ljpeg -lfreetype -btrfs_show_super_objects = cmds-inspect-dump-super.o btrfs_calc_size_objects = cmds-inspect-tree-stats.o cmds_restore_cflags = -DBTRFSRESTORE_ZSTD=$(BTRFSRESTORE_ZSTD) diff --git a/btrfs-show-super.c b/btrfs-show-super.c deleted file mode 100644 index 4273e42d..00000000 --- a/btrfs-show-super.c +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (C) 2012 STRATO AG. All rights reserved. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License v2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. - */ - -#include "utils.h" -#include "commands.h" -#include "help.h" - -int main(int argc, char **argv) -{ - - int ret; - - set_argv0(argv); - - warning( -"\nthe tool has been deprecated, please use 'btrfs inspect-internal dump-super' instead\n"); - - if (argc > 1 && !strcmp(argv[1], "--help")) - usage(cmd_inspect_dump_super_usage); - - ret = cmd_inspect_dump_super(argc, argv); - - return ret; -} -- cgit v1.2.3