diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2012-09-06 06:03:56 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2012-10-01 15:19:12 -0400 |
commit | 48c03c4bcfd7a1fcb1e05e9b1db1188cdbecf49a (patch) | |
tree | aa89a228922632062ce60e18719e1be0bdb4475a /fs/btrfs | |
parent | 42874b3db7817f662b1d7c6e32f8b63638fa0321 (diff) |
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: Miao Xie <miaox@cn.fujitsu.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/extent-tree.c | 6 | ||||
-rw-r--r-- | fs/btrfs/ioctl.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 36e03312267a..b6b33e463ac3 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -4414,10 +4414,10 @@ int btrfs_snap_reserve_metadata(struct btrfs_trans_handle *trans, | |||
4414 | struct btrfs_block_rsv *src_rsv = get_block_rsv(trans, root); | 4414 | struct btrfs_block_rsv *src_rsv = get_block_rsv(trans, root); |
4415 | struct btrfs_block_rsv *dst_rsv = &pending->block_rsv; | 4415 | struct btrfs_block_rsv *dst_rsv = &pending->block_rsv; |
4416 | /* | 4416 | /* |
4417 | * two for root back/forward refs, two for directory entries | 4417 | * two for root back/forward refs, two for directory entries, |
4418 | * and one for root of the snapshot. | 4418 | * one for root of the snapshot and one for parent inode. |
4419 | */ | 4419 | */ |
4420 | u64 num_bytes = btrfs_calc_trans_metadata_size(root, 5); | 4420 | u64 num_bytes = btrfs_calc_trans_metadata_size(root, 6); |
4421 | dst_rsv->space_info = src_rsv->space_info; | 4421 | dst_rsv->space_info = src_rsv->space_info; |
4422 | return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes); | 4422 | return block_rsv_migrate_bytes(src_rsv, dst_rsv, num_bytes); |
4423 | } | 4423 | } |
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index e6934de55a8b..c56daa368768 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -526,7 +526,7 @@ static int create_snapshot(struct btrfs_root *root, struct dentry *dentry, | |||
526 | *inherit = NULL; /* take responsibility to free it */ | 526 | *inherit = NULL; /* take responsibility to free it */ |
527 | } | 527 | } |
528 | 528 | ||
529 | trans = btrfs_start_transaction(root->fs_info->extent_root, 5); | 529 | trans = btrfs_start_transaction(root->fs_info->extent_root, 6); |
530 | if (IS_ERR(trans)) { | 530 | if (IS_ERR(trans)) { |
531 | ret = PTR_ERR(trans); | 531 | ret = PTR_ERR(trans); |
532 | goto fail; | 532 | goto fail; |