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

Commit f3b4e55d authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: drop version variable from ceph_monmap_decode()



It's set but not used: CEPH_FEATURE_MONNAMES feature bit isn't
advertised, which guarantees a v1 MonMap.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarAlex Elder <elder@linaro.org>
parent 1759f7b0
Loading
Loading
Loading
Loading
+1 −3
Original line number Original line Diff line number Diff line
@@ -43,15 +43,13 @@ struct ceph_monmap *ceph_monmap_decode(void *p, void *end)
	int i, err = -EINVAL;
	int i, err = -EINVAL;
	struct ceph_fsid fsid;
	struct ceph_fsid fsid;
	u32 epoch, num_mon;
	u32 epoch, num_mon;
	u16 version;
	u32 len;
	u32 len;


	ceph_decode_32_safe(&p, end, len, bad);
	ceph_decode_32_safe(&p, end, len, bad);
	ceph_decode_need(&p, end, len, bad);
	ceph_decode_need(&p, end, len, bad);


	dout("monmap_decode %p %p len %d\n", p, end, (int)(end-p));
	dout("monmap_decode %p %p len %d\n", p, end, (int)(end-p));

	p += sizeof(u16);  /* skip version */
	ceph_decode_16_safe(&p, end, version, bad);


	ceph_decode_need(&p, end, sizeof(fsid) + 2*sizeof(u32), bad);
	ceph_decode_need(&p, end, sizeof(fsid) + 2*sizeof(u32), bad);
	ceph_decode_copy(&p, &fsid, sizeof(fsid));
	ceph_decode_copy(&p, &fsid, sizeof(fsid));