diff options
| author | Alex Elder <elder@inktank.com> | 2013-04-21 16:51:50 -0500 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-01 21:19:24 -0700 |
| commit | 9ef1ee5a1b6ccb3220fb822523716e56c3629dbe (patch) | |
| tree | c4453f58c394922cfe81517c21e28939c69cf9a6 | |
| parent | 770eba6e295fd36e43881176ee0644b9cc2803f1 (diff) | |
| download | op-kernel-dev-9ef1ee5a1b6ccb3220fb822523716e56c3629dbe.zip op-kernel-dev-9ef1ee5a1b6ccb3220fb822523716e56c3629dbe.tar.gz | |
libceph: fix byte order mismatch
A WATCH op includes an object version. The version that's supplied
is incorrectly byte-swapped osd_req_op_watch_init() where it's first
assigned (it's been this way since that code was first added).
The result is that the version sent to the osd is wrong, because
that value gets byte-swapped again in osd_req_encode_op(). This
is the source of a sparse warning related to improper byte order in
the assignment.
The approach of using the version to avoid a race is deprecated
(see http://tracker.ceph.com/issues/3871), and the watch parameter
is no longer even examined by the osd. So fix the assignment in
osd_req_op_watch_init() so it no longer does the byte swap.
This resolves:
http://tracker.ceph.com/issues/3847
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| -rw-r--r-- | net/ceph/osd_client.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 467020c..57d8db5 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -577,8 +577,7 @@ void osd_req_op_watch_init(struct ceph_osd_request *osd_req, BUG_ON(opcode != CEPH_OSD_OP_NOTIFY_ACK && opcode != CEPH_OSD_OP_WATCH); op->watch.cookie = cookie; - /* op->watch.ver = version; */ /* XXX 3847 */ - op->watch.ver = cpu_to_le64(version); + op->watch.ver = version; if (opcode == CEPH_OSD_OP_WATCH && flag) op->watch.flag = (u8)1; } |
