diff options
author | Jeff Layton <jlayton@redhat.com> | 2017-04-04 08:39:36 -0400 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2017-05-04 09:19:20 +0200 |
commit | aa26d662b9d44e7f5b0d109e892e537a23471863 (patch) | |
tree | 1f167ec18bc29fadd6e94de57f6ec985b7c6c92f /net/ceph/osd_client.c | |
parent | 79162547b76e4979b21ef80c9629ada94a51a59b (diff) | |
download | linux-aa26d662b9d44e7f5b0d109e892e537a23471863.tar.gz linux-aa26d662b9d44e7f5b0d109e892e537a23471863.tar.bz2 linux-aa26d662b9d44e7f5b0d109e892e537a23471863.zip |
libceph: remove req->r_replay_version
Nothing uses this anymore with the removal of the ack vs. commit code.
Remove the field and just encode zeroes into place in the request
encoding.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'net/ceph/osd_client.c')
-rw-r--r-- | net/ceph/osd_client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index b4500a8ab8b3..feb666c22381 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1503,9 +1503,10 @@ static void encode_request(struct ceph_osd_request *req, struct ceph_msg *msg) ceph_encode_32(&p, req->r_flags); ceph_encode_timespec(p, &req->r_mtime); p += sizeof(struct ceph_timespec); - /* aka reassert_version */ - memcpy(p, &req->r_replay_version, sizeof(req->r_replay_version)); - p += sizeof(req->r_replay_version); + + /* reassert_version */ + memset(p, 0, sizeof(struct ceph_eversion)); + p += sizeof(struct ceph_eversion); /* oloc */ ceph_start_encoding(&p, 5, 4, |