diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:26:31 -0500 |
| commit | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (patch) | |
| tree | 3a97a48d6f282f9e06c5446beeb886fcd86c4798 /fs/btrfs/disk-io.c | |
| parent | d756bd2d9339447c29bde950910586df8f8941ec (diff) | |
| parent | 6bf7e080d5bcb0d399ee38ce3dabbfad64448192 (diff) | |
Merge branch 'for-chris' of git://git.jan-o-sch.net/btrfs-unstable into integration
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index e5167219c266..9be97716c5e0 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -1243,7 +1243,8 @@ static struct btrfs_root *alloc_log_tree(struct btrfs_trans_handle *trans, | |||
| 1243 | root->ref_cows = 0; | 1243 | root->ref_cows = 0; |
| 1244 | 1244 | ||
| 1245 | leaf = btrfs_alloc_free_block(trans, root, root->leafsize, 0, | 1245 | leaf = btrfs_alloc_free_block(trans, root, root->leafsize, 0, |
| 1246 | BTRFS_TREE_LOG_OBJECTID, NULL, 0, 0, 0); | 1246 | BTRFS_TREE_LOG_OBJECTID, NULL, |
| 1247 | 0, 0, 0, 0); | ||
| 1247 | if (IS_ERR(leaf)) { | 1248 | if (IS_ERR(leaf)) { |
| 1248 | kfree(root); | 1249 | kfree(root); |
| 1249 | return ERR_CAST(leaf); | 1250 | return ERR_CAST(leaf); |