btrfs: remove BUG_ON() due to mounting bad filesystem
PATCH 1/1 btrfs: remove BUG_ON() due to mounting bad filesystem
Mounting a bad filesystem caused a BUG_ON(). The following is steps to reproduce it.
# mkfs.btrfs /dev/sda2 # mount /dev/sda2 /mnt # mkfs.btrfs /dev/sda1 /dev/sda2 (the program says that /dev/sda2 was mounted, and then exits. ) # umount /mnt # mount /dev/sda1 /mnt
At the third step, mkfs.btrfs exited in the way of make filesystem. So the initialization of the filesystem didn't finish. So the filesystem was bad, and it caused BUG_ON() when mounting it. But BUG_ON() should be called by the wrong code, not user's operation, so I think it is a bug of btrfs.
This patch fixes it.
Signed-off-by Miao Xie <[email protected]>
--- fs/btrfs/disk-io.c | 7 ++++++- fs/btrfs/relocation.c | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-)
fs/btrfs/disk-io.c +6 -1
@@ -1982,7 +1982,12 @@ struct btrfs_root *open_ctree(struct super_block *sb,if (!(sb->s_flags &MS_RDONLY )) { ret =btrfs_recover_relocation (tree_root); -BUG_ON (ret); +if (ret <0 ) { +printk (KERN_WARNING +"btrfs: failed to recover relocation\n" ); + err = -EINVAL ; + goto fail_trans_kthread; + } } location.objectid =BTRFS_FS_TREE_OBJECTID ;
fs/btrfs/relocation.c +2 -1
@@ -3764,7 +3764,8 @@ out: BTRFS_DATA_RELOC_TREE_OBJECTID);if (IS_ERR (fs_root)) err =PTR_ERR (fs_root); -btrfs_orphan_cleanup (fs_root); +else +btrfs_orphan_cleanup (fs_root); }return err; }
Signature · 1 line
1.6.5.2