Skip to content

Commit

Permalink
libceph: use alloc_pg_mapping() in __decode_pg_upmap_items()
Browse files Browse the repository at this point in the history
... otherwise we die in insert_pg_mapping(), which wants pg->node to be
empty, i.e. initialized with RB_CLEAR_NODE.

Fixes: 6f428df ("libceph: pg_upmap[_items] infrastructure")
Signed-off-by: Ilya Dryomov <[email protected]>
  • Loading branch information
idryomov committed Jul 17, 2017
1 parent c2acfd9 commit f5cc689
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ceph/osdmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ static struct ceph_pg_mapping *__decode_pg_upmap_items(void **p, void *end,
return ERR_PTR(-EINVAL);

ceph_decode_need(p, end, 2 * len * sizeof(u32), e_inval);
pg = kzalloc(sizeof(*pg) + 2 * len * sizeof(u32), GFP_NOIO);
pg = alloc_pg_mapping(2 * len * sizeof(u32));
if (!pg)
return ERR_PTR(-ENOMEM);

Expand Down

0 comments on commit f5cc689

Please sign in to comment.