diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 19:24:44 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-05 19:24:44 -0500 |
| commit | 24f8ebe9189c91f1b3ecfaadd27ef0cb7c74907f (patch) | |
| tree | 80856cf81ec5cb377f7d871233dad0f0283a0c97 /fs/btrfs/send.c | |
| parent | 3c911608085bf2d5a0822c418129f96a2a89d1b5 (diff) | |
| parent | 59fe4f41976f6331b695ff049296d082cf621823 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next.git for-chris into for-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 54454542ad4..321b7fb4e44 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); |