On Tue, Sep 26, 2017 at 03:14:27PM +0300, Nikolay Borisov wrote:
>
>
> On 26.09.2017 11:47, Anand Jain wrote:
> > 1/2 fixes a bug which failed to reset writable when sprouting failed
> > 2/2 fixes BUG_ON in btrfs_init_new_device()
> >
> > Anand Jain (2):
> > btrfs: undo writable when sprouting fails
> > btrfs: fix BUG_ON in btrfs_init_new_device()
>
> Reviewed-by: Nikolay Borisov <nborisov@xxxxxxxx>
Please note that this would lead to unexpected unlocks of uuid_mutex and
sb::s_umount:
2465 ret = btrfs_commit_transaction(trans);
2466
2467 if (seeding_dev) {
2468 mutex_unlock(&uuid_mutex);
2469 up_write(&sb->s_umount);
first unlocks
2470
2471 if (ret) /* transaction commit */
2472 return ret;
2473
2474 ret = btrfs_relocate_sys_chunks(fs_info);
2475 if (ret < 0)
2476 btrfs_handle_fs_error(fs_info, ret,
2477 "Failed to relocate sys chunks after device initialization. This can be fixed using the \"btrfs balance\"
2478 trans = btrfs_attach_transaction(root);
2479 if (IS_ERR(trans)) {
2480 if (PTR_ERR(trans) == -ENOENT)
2481 return 0;
2482 return PTR_ERR(trans);
^^^^
this becomes goto 2494
2483 }
2484 ret = btrfs_commit_transaction(trans);
2485 }
2486
2487 /* Update ctime/mtime for libblkid */
2488 update_dev_time(device_path);
2489 return ret;
2490
2491 error_trans:
2492 btrfs_end_transaction(trans);
2493 rcu_string_free(device->name);
2494 btrfs_sysfs_rm_device_link(fs_info->fs_devices, device);
here
2495 kfree(device);
2496 error:
2497 blkdev_put(bdev, FMODE_EXCL);
2498 if (seeding_dev) {
2499 mutex_unlock(&uuid_mutex);
2500 up_write(&sb->s_umount);
and unlocking again
2501 }
2502 return ret;
So the in-place returns had a meaning but are quite confusing.
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
