diff options
| author | Sage Weil <sage@inktank.com> | 2012-05-07 15:36:35 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-05-07 15:39:34 -0700 |
| commit | fc7c3ae5ab9246ad96aab4d0d57f67e9255cfb56 (patch) | |
| tree | 07ceb79e0a20f9faac7c1621a0543e7ba908b6ff /net/ceph/osdmap.c | |
| parent | 41ebcc0907c58f75d0b25afcaf8b9c35c6b1ad14 (diff) | |
| download | linux-fc7c3ae5ab9246ad96aab4d0d57f67e9255cfb56.tar.gz linux-fc7c3ae5ab9246ad96aab4d0d57f67e9255cfb56.tar.bz2 linux-fc7c3ae5ab9246ad96aab4d0d57f67e9255cfb56.zip | |
crush: remove parent maps
These were used for the ill-fated forcefeed feature. Remove them.
Reflects ceph.git commit ebdf80edfecfbd5a842b71fbe5732857994380c1.
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph/osdmap.c')
| -rw-r--r-- | net/ceph/osdmap.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 9dda36f7aa9d..dac448ba68e4 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -161,13 +161,6 @@ static struct crush_map *crush_decode(void *pbyval, void *end) c->max_rules = ceph_decode_32(p); c->max_devices = ceph_decode_32(p); - c->device_parents = kcalloc(c->max_devices, sizeof(u32), GFP_NOFS); - if (c->device_parents == NULL) - goto badmem; - c->bucket_parents = kcalloc(c->max_buckets, sizeof(u32), GFP_NOFS); - if (c->bucket_parents == NULL) - goto badmem; - c->buckets = kcalloc(c->max_buckets, sizeof(*c->buckets), GFP_NOFS); if (c->buckets == NULL) goto badmem; |