diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2017-05-19 11:59:22 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2017-05-23 20:32:22 +0200 |
| commit | f3b4e55ded9b3c52831a7d2ab9e511293c99fc11 (patch) | |
| tree | 3aaf0752f228d7ef77eb0e3df60dbc9235efd841 /net | |
| parent | 1759f7b0e3fab1d1882d7c680af9d12c5c111b0e (diff) | |
| download | blackbird-op-linux-f3b4e55ded9b3c52831a7d2ab9e511293c99fc11.tar.gz blackbird-op-linux-f3b4e55ded9b3c52831a7d2ab9e511293c99fc11.zip | |
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: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/mon_client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 29a0ef351c5e..250f11f78609 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -43,15 +43,13 @@ struct ceph_monmap *ceph_monmap_decode(void *p, void *end) int i, err = -EINVAL; struct ceph_fsid fsid; u32 epoch, num_mon; - u16 version; u32 len; ceph_decode_32_safe(&p, end, len, bad); ceph_decode_need(&p, end, len, bad); dout("monmap_decode %p %p len %d\n", p, end, (int)(end-p)); - - ceph_decode_16_safe(&p, end, version, bad); + p += sizeof(u16); /* skip version */ ceph_decode_need(&p, end, sizeof(fsid) + 2*sizeof(u32), bad); ceph_decode_copy(&p, &fsid, sizeof(fsid)); |
