Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48c03c4b authored by Miao Xie's avatar Miao Xie Committed by Chris Mason
Browse files

Btrfs: fix wrong size for the reservation of the, snapshot creation 



We should insert/update 6 items(root ref, root backref, dir item, dir index,
root item and parent inode) when creating a snapshot, not 5 items, fix it.

Signed-off-by: default avatarMiao Xie <miaox@cn.fujitsu.com>
parent 42874b3d

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -4414,10 +4414,10 @@ int btrfs_snap_reserve_metadata(struct btrfs_trans_handle *trans, 
	struct btrfs_block_rsv *src_rsv = get_block_rsv(trans, root);

	struct btrfs_block_rsv *dst_rsv = &pending->block_rsv;

	/*

	 * two for root back/forward refs, two for directory entries

	 * and one for root of the snapshot.

	 * two for root back/forward refs, two for directory entries,

	 * one for root of the snapshot and one for parent inode.

	 */

	u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5);

	u64 num_bytes = btrfs_calc_trans_metadata_size(root, 6);

	dst_rsv->space_info = src_rsv->space_info;

	return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes);

}

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry, 
		*inherit = NULL;	/* take responsibility to free it */

	}



	trans = btrfs_start_transaction(root->fs_info->extent_root, 5);

	trans = btrfs_start_transaction(root->fs_info->extent_root, 6);

	if (IS_ERR(trans)) {

		ret = PTR_ERR(trans);

		goto fail;