From 58e631d01823afd60e52f3a09887f270a91889a0 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 10 May 2016 10:13:23 +0100 Subject: New upstream release 4.5.2. * Thanks for NMU of package rename. * New upstream release 4.5.2. * Upload using dgit. * Source-only upload. * btrfs-convert should not be included in the initramfs, but should be compiled. Using btrfs-convert is not a trivial operation, and especially not from a minimal shell. Also it is known to fail, and for a sophisticated user it is trivial to include it in the initramfs. Thus won't fix Closes: #801192 * No sponsorship required Closes: #823474 * Add Provides btrfs-tools-udeb to the -progs-udeb package. --- btrfs-zero-log.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'btrfs-zero-log.c') diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c index 058e9b19..f5ca9fcf 100644 --- a/btrfs-zero-log.c +++ b/btrfs-zero-log.c @@ -31,31 +31,31 @@ __attribute__((noreturn)) static void print_usage(void) exit(1); } -int main(int ac, char **av) +int main(int argc, char **argv) { struct btrfs_root *root; struct btrfs_trans_handle *trans; struct btrfs_super_block *sb; int ret; - set_argv0(av); - if (check_argc_exact(ac, 2)) + 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(av[1])) < 0) { + 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", av[1]); + fprintf(stderr, "ERROR: %s is currently mounted\n", argv[optind]); ret = -EBUSY; goto out; } - root = open_ctree(av[1], 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL); + root = open_ctree(argv[optind], 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL); if (!root) { fprintf(stderr, "ERROR: cannot open ctree\n"); return 1; @@ -63,7 +63,7 @@ int main(int ac, char **av) sb = root->fs_info->super_copy; printf("Clearing log on %s, previous log_root %llu, level %u\n", - av[1], + argv[optind], (unsigned long long)btrfs_super_log_root(sb), (unsigned)btrfs_super_log_root_level(sb)); trans = btrfs_start_transaction(root, 1); -- cgit v1.2.3