Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3848af1 authored by Jeff Layton's avatar Jeff Layton Committed by Ilya Dryomov
Browse files

ceph: have MDS map decoding use entity_addr_t decoder 



Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 8cb5f2b4

fs/ceph/mdsmap.c

+8 −4
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 
	struct ceph_mdsmap *m;

	const void *start = *p;

	int i, j, n;

	int err = -EINVAL;

	int err;

	u8 mdsmap_v, mdsmap_cv;

	u16 mdsmap_ev;
@@ -183,8 +183,9 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 
		inc = ceph_decode_32(p);

		state = ceph_decode_32(p);

		state_seq = ceph_decode_64(p);

		ceph_decode_copy(p, &addr, sizeof(addr));

		ceph_decode_addr(&addr);

		err = ceph_decode_entity_addr(p, end, &addr);

		if (err)

			goto corrupt;

		ceph_decode_copy(p, &laggy_since, sizeof(laggy_since));

		*p += sizeof(u32);

		ceph_decode_32_safe(p, end, namelen, bad);
@@ -357,7 +358,7 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 
nomem:

	err = -ENOMEM;

	goto out_err;

bad:

corrupt:

	pr_err("corrupt mdsmap\n");

	print_hex_dump(KERN_DEBUG, "mdsmap: ",

		       DUMP_PREFIX_OFFSET, 16, 1,
@@ -365,6 +366,9 @@ struct ceph_mdsmap *ceph_mdsmap_decode(void **p, void *end) 
out_err:

	ceph_mdsmap_destroy(m);

	return ERR_PTR(err);

bad:

	err = -EINVAL;

	goto corrupt;

}



void ceph_mdsmap_destroy(struct ceph_mdsmap *m)