adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus

Browse source
This commit is contained in:
Chris Mason 2009-12-17 16:01:41 -05:00
commit 7a5d24b106
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fs/btrfs/inode.c
View file

@ -5802,23 +5802,23 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
while (num_bytes > 0) { while (num_bytes > 0) {
alloc_size = min(num_bytes, root->fs_info->max_extent); alloc_size = min(num_bytes, root->fs_info->max_extent);
trans = btrfs_start_transaction(root, 1);
ret = btrfs_reserve_extent(trans, root, alloc_size, ret = btrfs_reserve_extent(trans, root, alloc_size,
root->sectorsize, 0, alloc_hint, root->sectorsize, 0, alloc_hint,
(u64)-1, &ins, 1); (u64)-1, &ins, 1);
if (ret) { if (ret) {
WARN_ON(1); WARN_ON(1);
break; goto stop_trans;
} }
ret = btrfs_reserve_metadata_space(root, 3); ret = btrfs_reserve_metadata_space(root, 3);
if (ret) { if (ret) {
btrfs_free_reserved_extent(root, ins.objectid, btrfs_free_reserved_extent(root, ins.objectid,
ins.offset); ins.offset);
break; goto stop_trans;
} }
trans = btrfs_start_transaction(root, 1);
ret = insert_reserved_file_extent(trans, inode, ret = insert_reserved_file_extent(trans, inode,
cur_offset, ins.objectid, cur_offset, ins.objectid,
ins.offset, ins.offset, ins.offset, ins.offset,
@ -5847,6 +5847,11 @@ static int prealloc_file_range(struct inode *inode, u64 start, u64 end,
btrfs_unreserve_metadata_space(root, 3); btrfs_unreserve_metadata_space(root, 3);
} }
return ret; return ret;
stop_trans:
btrfs_end_transaction(trans, root);
return ret;
} }
static long btrfs_fallocate(struct inode *inode, int mode, static long btrfs_fallocate(struct inode *inode, int mode,