projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1759f7b
)
libceph: drop version variable from ceph_monmap_decode()
author
Ilya Dryomov
<idryomov@gmail.com>
Fri, 19 May 2017 09:59:22 +0000
(11:59 +0200)
committer
Ilya Dryomov
<idryomov@gmail.com>
Tue, 23 May 2017 18:32:22 +0000
(20:32 +0200)
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>
net/ceph/mon_client.c
patch
|
blob
|
blame
|
history
diff --git
a/net/ceph/mon_client.c
b/net/ceph/mon_client.c
index 29a0ef351c5e068838fc1ed8f634439853ff0a3a..250f11f786092d902b52da5af9a228d9786acf62 100644
(file)
--- 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));