3821ed946a
- version 3.16 - show-super: skip unrecognized sb, add option to force - debug-tree: print tree by id - mkfs: new option to specify UUID - receive: new option to limit number of errors - check: new option to verify quotas - check: reduced memory requirements - check: new option to print extent sharing - restore: check length before decompression - restore: more error handling - balance: new filter 'limit' - recover: allow to read all sb copies - restore: option to loop during restoring - mkfs: drop experimental notice - btrfstune: new option to force dangerous changes - documentation updates - Deleted patches (upstream): * 0001-btrfs-progs-doc-fix-symlink-target-for-btrfsck.8.patch * 0200-btrfs-progs-print-qgroup-excl-as-unsigned.patch * 0201-btrfs-progs-import-ulist.patch * 0202-btrfs-progs-add-quota-group-verify-code.patch * 0203-btrfs-progs-show-extent-state-for-a-subvolume.patch * 0204-btrfs-progs-ignore-orphaned-qgroups-by-default.patch * btrfs-progs-canonicalize-pathnames-for-device-commands - Refreshed patches: * 0006-Btrfs-progs-fsck-clear-out-log-tree-in-repair-mode.patch * 0011-btrfs-progs-Enhance-the-command-btrfs-filesystem-df.patch * 0012-btrfs-progs-Add-helpers-functions-to-handle-the-prin.patch * 0013-btrfs-progs-Add-command-btrfs-filesystem-disk-usage.patch * 0028-btrfs-progs-extend-pretty-printers-with-unit-mode.patch * 0164-btrfs-progs-convert-set-label-or-copy-from-origin.patch OBS-URL: https://build.opensuse.org/request/show/246571 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=167
69 lines
2.0 KiB
Diff
69 lines
2.0 KiB
Diff
From 3ecff1d8f1eaa5e0d065c439cf72032dd01da751 Mon Sep 17 00:00:00 2001
|
|
From: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
|
|
Date: Thu, 24 Apr 2014 11:19:16 +0800
|
|
Subject: [PATCH 13/42] Btrfs-progs: fsck: clear out log tree in repair mode
|
|
|
|
Repair mode will commit transaction which will make us
|
|
fail to load log tree anymore.
|
|
|
|
Give a warning to common users, if they really want to
|
|
coninue, we will clear out log tree.
|
|
|
|
Signed-off-by: Wang Shilong <wangsl.fnst@cn.fujitsu.com>
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
---
|
|
cmds-check.c | 33 +++++++++++++++++++++++++++++++++
|
|
1 file changed, 33 insertions(+)
|
|
|
|
Index: btrfs-progs-v3.16/cmds-check.c
|
|
===================================================================
|
|
--- btrfs-progs-v3.16.orig/cmds-check.c
|
|
+++ btrfs-progs-v3.16/cmds-check.c
|
|
@@ -6538,6 +6538,22 @@ out:
|
|
return ret;
|
|
}
|
|
|
|
+static int zero_log_tree(struct btrfs_root *root)
|
|
+{
|
|
+ struct btrfs_trans_handle *trans;
|
|
+ int ret;
|
|
+
|
|
+ trans = btrfs_start_transaction(root, 1);
|
|
+ if (IS_ERR(trans)) {
|
|
+ ret = PTR_ERR(trans);
|
|
+ return ret;
|
|
+ }
|
|
+ btrfs_set_super_log_root(root->fs_info->super_copy, 0);
|
|
+ btrfs_set_super_log_root_level(root->fs_info->super_copy, 0);
|
|
+ ret = btrfs_commit_transaction(trans, root);
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static struct option long_options[] = {
|
|
{ "super", 1, NULL, 's' },
|
|
{ "repair", 0, NULL, 0 },
|
|
@@ -6657,6 +6673,23 @@ int cmd_check(int argc, char **argv)
|
|
}
|
|
|
|
root = info->fs_root;
|
|
+ /*
|
|
+ * repair mode will force us to commit transaction which
|
|
+ * will make us fail to load log tree when mounting.
|
|
+ */
|
|
+ if (repair && btrfs_super_log_root(info->super_copy)) {
|
|
+ ret = ask_user("repair mode will force to clear out log tree, Are you sure?");
|
|
+ if (!ret) {
|
|
+ ret = 1;
|
|
+ goto close_out;
|
|
+ }
|
|
+ ret = zero_log_tree(root);
|
|
+ if (ret) {
|
|
+ fprintf(stderr, "fail to zero log tree\n");
|
|
+ goto close_out;
|
|
+ }
|
|
+ }
|
|
+
|
|
uuid_unparse(info->super_copy->fsid, uuidbuf);
|
|
if (qgroup_report) {
|
|
printf("Print quota groups for %s\nUUID: %s\n", argv[optind],
|