From 8f4982eca760d8dd99f01f6bb087e10c00f4f73a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Thu, 8 Jul 2010 14:49:38 +0200
Subject: [PATCH] --- yaml --- r: 201103 b: refs/heads/master c:
 b0bbb0be8f7fbf6d366b359e034c78a96c4e274d h: refs/heads/master i:   201101:
 a8484aaf85507005cc992a0826d0151440607912   201099:
 c45b14011e611aee471981d1502fbb6bcf4b1713   201095:
 d5ebcd0276377dd1a00da02e8c0a145d6bf111ee   201087:
 7481c047ade02adbeace3dc6c5d8918000ab7b67 v: v3

---
 [refs]                 | 2 +-
 trunk/fs/ceph/osdmap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 48f83799a504..3b4afd4b488d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22b1de06c9fe128ca3de72560c3e8c2cabf2927a
+refs/heads/master: b0bbb0be8f7fbf6d366b359e034c78a96c4e274d
diff --git a/trunk/fs/ceph/osdmap.c b/trunk/fs/ceph/osdmap.c
index 50ce64ebd330..277f8b339577 100644
--- a/trunk/fs/ceph/osdmap.c
+++ b/trunk/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);