diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Documentation/Makefile.in | 1 | ||||
| -rw-r--r-- | Documentation/btrfs.asciidoc | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | btrfs-zero-log.c | 78 | ||||
| -rwxr-xr-x | tests/misc-tests.sh | 1 | ||||
| -rwxr-xr-x | tests/misc-tests/003-zero-log/test.sh | 6 |
7 files changed, 4 insertions, 89 deletions
@@ -28,7 +28,6 @@ btrfs-find-root btrfs-find-root.static btrfs-image btrfs-show-super -btrfs-zero-log btrfs-corrupt-block btrfs-select-super btrfs-calc-size diff --git a/Documentation/Makefile.in b/Documentation/Makefile.in index 0a90f803..ee32a50d 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-rescue.8.gz $(DESTDIR)$(man8dir)/btrfs-zero-log.8.gz $(LN_S) -f btrfs-inspect-internal.8.gz $(DESTDIR)$(man8dir)/btrfs-show-super.8.gz uninstall: diff --git a/Documentation/btrfs.asciidoc b/Documentation/btrfs.asciidoc index b9d277c4..62bbdb3f 100644 --- a/Documentation/btrfs.asciidoc +++ b/Documentation/btrfs.asciidoc @@ -123,7 +123,7 @@ 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-zero-log*:: moved to *btrfs rescue zero-log* +*btrfs-zero-log*:: moved to *btrfs rescue zero-log*, standalone removed. EXIT STATUS ----------- @@ -210,7 +210,7 @@ MAKEOPTS = --no-print-directory Q=$(Q) progs = $(progs_install) btrfsck btrfs-corrupt-block # install only selected -progs_install = btrfs mkfs.btrfs btrfs-map-logical btrfs-image btrfs-zero-log \ +progs_install = btrfs mkfs.btrfs btrfs-map-logical btrfs-image \ btrfs-find-root btrfstune \ btrfs-select-super @@ -322,7 +322,7 @@ test-fsck: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune $(Q)bash tests/fsck-tests.sh test-misc: btrfs btrfs-image btrfs-corrupt-block mkfs.btrfs btrfstune fssum \ - btrfs-zero-log btrfs-find-root btrfs-select-super btrfs-convert + btrfs-find-root btrfs-select-super btrfs-convert @echo " [TEST] misc-tests.sh" $(Q)bash tests/misc-tests.sh diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c deleted file mode 100644 index 2fce59e9..00000000 --- a/btrfs-zero-log.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2007 Oracle. 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 "kerncompat.h" - -#include <stdio.h> -#include <unistd.h> -#include "ctree.h" -#include "disk-io.h" -#include "transaction.h" -#include "utils.h" -#include "help.h" - -__attribute__((noreturn)) static void print_usage(void) -{ - printf("usage: btrfs-zero-log dev\n"); - exit(1); -} - -int main(int argc, char **argv) -{ - struct btrfs_root *root; - struct btrfs_trans_handle *trans; - struct btrfs_super_block *sb; - int ret; - - set_argv0(argv); - if (check_argc_exact(argc - optind, 1)) - print_usage(); - - radix_tree_init(); - - printf("WARNING: this utility is deprecated, please use 'btrfs rescue zero-log'\n\n"); - - if ((ret = check_mounted(argv[optind])) < 0) { - fprintf(stderr, "ERROR: could not check mount status: %s\n", strerror(-ret)); - goto out; - } else if (ret) { - fprintf(stderr, "ERROR: %s is currently mounted\n", argv[optind]); - ret = -EBUSY; - goto out; - } - - root = open_ctree(argv[optind], 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL); - if (!root) { - fprintf(stderr, "ERROR: cannot open ctree\n"); - return 1; - } - - sb = root->fs_info->super_copy; - printf("Clearing log on %s, previous log_root %llu, level %u\n", - argv[optind], - (unsigned long long)btrfs_super_log_root(sb), - (unsigned)btrfs_super_log_root_level(sb)); - trans = btrfs_start_transaction(root, 1); - BUG_ON(IS_ERR(trans)); - btrfs_set_super_log_root(root->fs_info->super_copy, 0); - btrfs_set_super_log_root_level(root->fs_info->super_copy, 0); - btrfs_commit_transaction(trans, root); - close_ctree(root); -out: - return !!ret; -} diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index 94703a3e..dad397ec 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -46,7 +46,6 @@ check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfstune check_prereq btrfs -check_prereq btrfs-zero-log check_prereq btrfs-find-root check_prereq btrfs-select-super check_kernel_support diff --git a/tests/misc-tests/003-zero-log/test.sh b/tests/misc-tests/003-zero-log/test.sh index b24616a9..c6742bf3 100755 --- a/tests/misc-tests/003-zero-log/test.sh +++ b/tests/misc-tests/003-zero-log/test.sh @@ -24,11 +24,7 @@ test_zero_log() --rootdir "$INTERNAL_BIN/Documentation" \ "$TEST_DEV" run_check "$TOP/btrfs" inspect-internal dump-super "$TEST_DEV" - if [ "$1" = 'standalone' ]; then - run_check "$TOP/btrfs" rescue zero-log "$TEST_DEV" - else - run_check "$TOP/btrfs-zero-log" "$TEST_DEV" - fi + run_check "$TOP/btrfs" rescue zero-log "$TEST_DEV" log_root=$(get_log_root "$TEST_DEV") log_root_level=$(get_log_root "$TEST_DEV") if [ "$log_root" != 0 ]; then |