git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[pandora-kernel.git]
/
net
/
ceph
/
osdmap.c
diff --git
a/net/ceph/osdmap.c
b/net/ceph/osdmap.c
index
d73f3f6
..
71603ac
100644
(file)
--- a/
net/ceph/osdmap.c
+++ b/
net/ceph/osdmap.c
@@
-605,8
+605,10
@@
struct ceph_osdmap *osdmap_decode(void **p, void *end)
goto bad;
}
err = __decode_pool(p, end, pi);
- if (err < 0)
+ if (err < 0) {
+ kfree(pi);
goto bad;
+ }
__insert_pg_pool(&map->pg_pools, pi);
}