diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 23:03:52 +0400 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 23:03:52 +0400 |
| commit | 9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080 (patch) | |
| tree | f059571830a159f05b8cdf4ec354b01ca7d6bc45 /fs/btrfs/send.c | |
| parent | 75431f9d7335daf7fb9e72b3a1539ce610142618 (diff) | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
| download | linux-9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080.tar.xz | |
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
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); |