GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration

Browse source
This commit is contained in:
Chris Mason 2012-01-16 15:26:31 -05:00
commit 9785dbdf26
21 changed files with 1639 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

3
fs/btrfs/disk-io.c
View file

@ -1243,7 +1243,8 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans,
root->ref_cows = 0;
leaf = btrfs_alloc_free_block(trans, root, root->leafsize, 0,
BTRFS_TREE_LOG_OBJECTID, NULL, 0, 0, 0);
BTRFS_TREE_LOG_OBJECTID, NULL,
0, 0, 0, 0);
if (IS_ERR(leaf)) {
kfree(root);
return ERR_CAST(leaf);