path: root/mkfs
diff options
authorQu Wenruo <>2017-10-19 13:41:36 +0800
committerDavid Sterba <>2017-11-14 15:59:00 +0100
commitfec462240d7722a5952969a1b4c39ce719661ed7 (patch)
tree714a2cf9c498444a7a2bb135f0cf5b44d532d517 /mkfs
parent625223903e23b46de615e71e9860a17afcd87632 (diff)
btrfs-progs: mkfs: error out gracefully for --rootdir
--rootdir option will start a transaction to fill the fs, however if something goes wrong, from ENOSPC to lack of permission, we won't commit the transaction and cause BUG_ON triggered by uncommitted transaction: ------ extent buffer leak: start 29392896 len 16384 extent_io.c:579: free_extent_buffer: BUG_ON `eb->flags & EXTENT_DIRTY` triggered, value 1 ------ The root fix is to introduce btrfs_abort_transaction() in btrfs-progs, however in this particular case, we can workaround it by force committing the transaction. Since during mkfs, the magic of btrfs is set to an invalid one, without setting fs_info->finalize_on_close() the fs is never able to be mounted. So even we force to commit wrong transaction we won't screw up things worse. Signed-off-by: Qu Wenruo <> Reviewed-by: Nikolay Borisov <> Signed-off-by: David Sterba <>
Diffstat (limited to 'mkfs')
1 files changed, 13 insertions, 0 deletions
diff --git a/mkfs/main.c b/mkfs/main.c
index 284dbd75..7d9fa38c 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -1073,6 +1073,19 @@ static int make_image(const char *source_dir, struct btrfs_root *root)
printf("Making image is completed.\n");
return 0;
+ /*
+ * Since we don't have btrfs_abort_transaction() yet, uncommitted trans
+ * will trigger a BUG_ON().
+ *
+ * However before mkfs is fully finished, the magic number is invalid,
+ * so even we commit transaction here, the fs still can't be mounted.
+ *
+ * To do a graceful error out, here we commit transaction as a
+ * workaround.
+ * Since we have already hit some problem, the return value doesn't
+ * matter now.
+ */
+ btrfs_commit_transaction(trans, root);
while (!list_empty(&dir_head.list)) {
dir_entry = list_entry(,
struct directory_name_entry, list);