From: Wang Shilong Date: Thu, 29 May 2014 10:01:42 +0000 (+0800) Subject: btrfs-progs: fsck: finish transaction commit if repair error out X-Git-Tag: upstream/4.16.1~2684 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d0a3eac0c79e076d35afbcc641a7eda2aa793bc;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: fsck: finish transaction commit if repair error out If btrfsck fail to repair, we hit something like following: Check tree block failed, want=29442048, have=0 Check tree block failed, want=29442048, have=0 Check tree block failed, want=29442048, have=0 Check tree block failed, want=29442048, have=0 Check tree block failed, want=29442048, have=0 read block failed check_tree_block found 98304 bytes used err is 1 total csum bytes: 0 total tree bytes: 0 total fs tree bytes: 0 total extent tree bytes: 0 btree space waste bytes: 0 file data blocks allocated: 0 referenced 0 Btrfs v3.14.2-rc2-63-g3944f15 btrfs: transaction.h:38: btrfs_start_transaction: Assertion `!(root->commit_root)' failed. Aborted (core dumped) This is because under repair mode, we will start a transaction, and if we error out, we don't finish this transaction. So in close_ctree(), it will try to start and commit transaction which causes the above segmentation. Signed-off-by: Wang Shilong Signed-off-by: David Sterba --- diff --git a/cmds-check.c b/cmds-check.c index a771437..156ab72 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -6049,12 +6049,12 @@ again: if (err && !ret) ret = err; +out: if (trans) { err = btrfs_commit_transaction(trans, root); if (!ret) ret = err; } -out: if (repair) { free_corrupt_blocks_tree(root->fs_info->corrupt_blocks); root->fs_info->fsck_extent_cache = NULL;