diff options
| author |  Chris Mason <clm@fb.com>
| 2016-01-11 05:59:32 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com>
| 2016-01-11 05:59:32 -0800 |
| commit | a3058101c17d2825f34a0ab5c37d93ead0f4d9dc (patch) | |
| tree | 193417b02c4fa79b582b435e154761b91a501884 /fs/btrfs/transaction.c | |
| parent | btrfs: don't run delayed references while we are creating the free space tree (diff) | |
| parent | Btrfs: Check metadata redundancy on balance (diff) | |
| download | linux-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.tar.gz linux-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.tar.bz2 linux-a3058101c17d2825f34a0ab5c37d93ead0f4d9dc.zip | |
Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index f85ccf634ca1..34961f02e58c 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1336,17 +1336,11 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, u64 root_flags; uuid_le new_uuid; - path = btrfs_alloc_path(); - if (!path) { - pending->error = -ENOMEM; - return 0; - } + ASSERT(pending->path); + path = pending->path; - new_root_item = kmalloc(sizeof(*new_root_item), GFP_NOFS); - if (!new_root_item) { - pending->error = -ENOMEM; - goto root_item_alloc_fail; - } + ASSERT(pending->root_item); + new_root_item = pending->root_item; pending->error = btrfs_find_free_objectid(tree_root, &objectid); if (pending->error) @@ -1579,8 +1573,10 @@ clear_skip_qgroup: btrfs_clear_skip_qgroup(trans); no_free_objectid: kfree(new_root_item); -root_item_alloc_fail: + pending->root_item = NULL; btrfs_free_path(path); + pending->path = NULL; + return ret; } |