redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

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

Browse source 
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: Miao Xie <miaox@cn.fujitsu.com>
This commit is contained in:
Miao Xie 2012-09-06 04:03:56 -06:00 committed by Chris Mason
parent 42874b3db7
commit 48c03c4bcf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/btrfs/extent-tree.c
View file

@ -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 *src_rsv = get_block_rsv(trans, root);
struct btrfs_block_rsv *dst_rsv = &pending->block_rsv; struct btrfs_block_rsv *dst_rsv = &pending->block_rsv;
/* /*
* two for root back/forward refs, two for directory entries * two for root back/forward refs, two for directory entries,
* and one for root of the snapshot. * 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; dst_rsv->space_info = src_rsv->space_info;
return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes); return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes);
} }

2
fs/btrfs/ioctl.c
View file

@ -526,7 +526,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry,
*inherit = NULL; /* take responsibility to free it */ *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)) { if (IS_ERR(trans)) {
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto fail; goto fail;