Commit 8f63ca2d authored Mar 04, 2013 by Alex Elder Committed by Sage Weil May 01, 2013

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 <fengguang.wu@intel.com>
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>

parent 0d5af164

net/ceph/osd_client.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message