From 8f63ca2d23c7922b24d7b95e54740ec29c859379 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 4 Mar 2013 11:08:29 -0600 Subject: [PATCH] libceph: fix wrong opcode use in osd_req_encode_op() The new cases added to osd_req_encode_op() caused a new sparse error, which highlighted an existing problem that had been overlooked since it was originally checked in. When an unsupported opcode is found the destination rather than the source opcode was being used in the error message. The two differ in their byte order, and we want to be using the one in the source. Fix the problem in both spots. Reported-by: Fengguang Wu Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- net/ceph/osd_client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index a28c976ae3ae..d7ce457c59d9 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -249,7 +249,7 @@ static void osd_req_encode_op(struct ceph_osd_request *req, dst->watch.flag = src->watch.flag; break; default: - pr_err("unrecognized osd opcode %d\n", dst->op); + pr_err("unrecognized osd opcode %d\n", src->op); WARN_ON(1); break; case CEPH_OSD_OP_MAPEXT: @@ -307,7 +307,7 @@ static void osd_req_encode_op(struct ceph_osd_request *req, case CEPH_OSD_OP_PGLS: case CEPH_OSD_OP_PGLS_FILTER: pr_err("unsupported osd opcode %s\n", - ceph_osd_op_name(dst->op)); + ceph_osd_op_name(src->op)); WARN_ON(1); break; } -- 2.20.1