diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:02 +0100 |
commit | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (patch) | |
tree | 49eafdcf4d6ac490ecdd92c36c285817872eaf34 /fs/ceph/osdmap.c | |
parent | 392c57a2ec811db37ae45adc513704cf92ba3e69 (diff) | |
parent | cccf59abea4e1c36322e365d6e61ff7de1f3ee07 (diff) | |
download | op-kernel-dev-129961ecaf21c9ee899ad9067d917c1aa172fb7a.zip op-kernel-dev-129961ecaf21c9ee899ad9067d917c1aa172fb7a.tar.gz |
Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable
Diffstat (limited to 'fs/ceph/osdmap.c')
-rw-r--r-- | fs/ceph/osdmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/osdmap.c b/fs/ceph/osdmap.c index 50ce64e..277f8b3 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c @@ -568,6 +568,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end) if (ev > CEPH_PG_POOL_VERSION) { pr_warning("got unknown v %d > %d of ceph_pg_pool\n", ev, CEPH_PG_POOL_VERSION); + kfree(pi); goto bad; } __decode_pool(p, pi); |