diff options
| author | Greg Kroah-Hartman <[email protected]> | 2013-01-25 21:27:36 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2013-01-25 21:27:36 +0000 |
| commit | 9f9cba810f36d16f4e64477e879a69f6c47b389d (patch) | |
| tree | d787abcbead1439d3f82f0719efe520fd9689f79 /fs/btrfs/send.c | |
| parent | serial: tegra: Fix compilation error (diff) | |
| parent | Linux 3.8-rc5 (diff) | |
| download | kernel-9f9cba810f36d16f4e64477e879a69f6c47b389d.tar.gz kernel-9f9cba810f36d16f4e64477e879a69f6c47b389d.zip | |
Merge 3.8-rc5 into tty-next
This resolves a number of tty driver merge issues found in linux-next
Signed-off-by: Greg Kroah-Hartman <[email protected]>
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); |