diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 19:27:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-20 19:27:58 -0400 |
| commit | e0959371b4aaddb9b986019d5cfef93f9801d0ff (patch) | |
| tree | 7df35d0e8dc8de31fa19aa0f8f3fad78b2afea11 /fs/ceph/osdmap.c | |
| parent | 83ba37105e262d374b9092a572b8ee6e30aa9f70 (diff) | |
| parent | e979cf50395e24c4bdd489f60e2d5dd5ae66d255 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
ceph: do not include cap/dentry releases in replayed messages
ceph: reuse request message when replaying against recovering mds
ceph: fix creation of ipv6 sockets
ceph: fix parsing of ipv6 addresses
ceph: fix printing of ipv6 addrs
ceph: add kfree() to error path
ceph: fix leak of mon authorizer
ceph: fix message revocation
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 50ce64ebd330..277f8b339577 100644 --- a/fs/ceph/osdmap.c +++ b/fs/ceph/osdmap.c | |||
| @@ -568,6 +568,7 @@ struct ceph_osdmap *osdmap_decode(void **p, void *end) | |||
| 568 | if (ev > CEPH_PG_POOL_VERSION) { | 568 | if (ev > CEPH_PG_POOL_VERSION) { |
| 569 | pr_warning("got unknown v %d > %d of ceph_pg_pool\n", | 569 | pr_warning("got unknown v %d > %d of ceph_pg_pool\n", |
| 570 | ev, CEPH_PG_POOL_VERSION); | 570 | ev, CEPH_PG_POOL_VERSION); |
| 571 | kfree(pi); | ||
| 571 | goto bad; | 572 | goto bad; |
| 572 | } | 573 | } |
| 573 | __decode_pool(p, pi); | 574 | __decode_pool(p, pi); |