marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Nikolay Borisov 2018-03-27 10:45:45 +03:00 committed by David Sterba
parent df9158f20d
commit 5a87a95115
6 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

1
Documentation/Makefile.in
View File

@ -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)

3
Documentation/btrfs-select-super.asciidoc
View File

@ -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.

3
Documentation/btrfs.asciidoc
View File

@ -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

3
Makefile
View File

@ -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)

39
btrfs-show-super.c
View File

@ -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;
}