diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-01-21 20:26:55 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-01-21 20:26:55 -0500 |
| commit | daf2c08911522d1739c55baf35f03531a29c87ef (patch) | |
| tree | 380d89b955baebd90ca5ac1cf6527f963cf7dae7 /fs/btrfs/send.c | |
| parent | 2cf687039676c2b6e1ee96b0b89090aca94babcd (diff) | |
| parent | 3972f2603d8570effaf633cea52b12c7c2773c11 (diff) | |
| download | talos-op-linux-daf2c08911522d1739c55baf35f03531a29c87ef.tar.gz talos-op-linux-daf2c08911522d1739c55baf35f03531a29c87ef.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into linus
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 54454542ad40..321b7fb4e441 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -1814,8 +1814,10 @@ static int name_cache_insert(struct send_ctx *sctx, (unsigned long)nce->ino); if (!nce_head) { nce_head = kmalloc(sizeof(*nce_head), GFP_NOFS); - if (!nce_head) + if (!nce_head) { + kfree(nce); return -ENOMEM; + } INIT_LIST_HEAD(nce_head); ret = radix_tree_insert(&sctx->name_cache, nce->ino, nce_head); |
