5be20c4ea7
SR: a few fixes, aimed for 13.1 RC2 - fsck updates - more mkfs sanity checks - qgroup rescan wait OBS-URL: https://build.opensuse.org/request/show/205320 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=144
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From bdccfd46b1f2ff668351790db42e8831ca4ec4b4 Mon Sep 17 00:00:00 2001
|
|
From: Josef Bacik <jbacik@fusionio.com>
|
|
Date: Fri, 14 Jun 2013 14:25:54 -0400
|
|
Subject: [PATCH 50/62] Btrfs-progs: commit the csum_root if we do
|
|
--init-csum-tree
|
|
|
|
This is just an oddity with the commit stuff in btrfs-progs. It will just
|
|
update the generation of the root you call with, which in btrfsck case would
|
|
have been the fs_root. But because we didn't actually update the fs_root we
|
|
wouldn't have cow'ed the fs root and therefore the generation will not match the
|
|
node which will make the file system unmountable. Fix this by calling with the
|
|
csum_root which is the one we're messing with. Thanks,
|
|
|
|
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
|
|
Signed-off-by: David Sterba <dsterba@suse.cz>
|
|
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
|
|
---
|
|
cmds-check.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cmds-check.c b/cmds-check.c
|
|
index 8015288318a2..dbb41e5a4d5b 100644
|
|
--- a/cmds-check.c
|
|
+++ b/cmds-check.c
|
|
@@ -5800,7 +5800,7 @@ int cmd_check(int argc, char **argv)
|
|
return -EIO;
|
|
}
|
|
|
|
- ret = btrfs_commit_transaction(trans, root);
|
|
+ ret = btrfs_commit_transaction(trans, info->csum_root);
|
|
if (ret)
|
|
exit(1);
|
|
goto out;
|
|
--
|
|
1.8.3.1
|
|
|