summaryrefslogtreecommitdiff
path: root/net/ceph
diff options
context:
space:
mode:
authorIlya Dryomov <idryomov@gmail.com>2017-02-28 20:53:53 +0300
committerIlya Dryomov <idryomov@gmail.com>2017-03-07 16:30:37 +0300
commit9afd30dbc82a9dbea4101aba57beb2a2a7e1b8d5 (patch)
tree41513ac5ab92f482a9a965d5932d58ecf2f92cb0 /net/ceph
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
downloadlinux-9afd30dbc82a9dbea4101aba57beb2a2a7e1b8d5.tar.xz
libceph: fix crush_decode() for older maps
Older (shorter) CRUSH maps too need to be finalized. Fixes: 66a0e2d579db ("crush: remove mutable part of CRUSH map") Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph')
-rw-r--r--net/ceph/osdmap.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c
index 6824c0ec8373..cc22dd282a3e 100644
--- a/net/ceph/osdmap.c
+++ b/net/ceph/osdmap.c
@@ -390,9 +390,8 @@ static struct crush_map *crush_decode(void *pbyval, void *end)
dout("crush decode tunable chooseleaf_stable = %d\n",
c->chooseleaf_stable);
- crush_finalize(c);
-
done:
+ crush_finalize(c);
dout("crush_decode success\n");
return c;