aboutsummaryrefslogtreecommitdiffstats
path: root/net/ceph/osd_client.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-04 12:08:29 -0500
committerSage Weil <sage@inktank.com>2013-05-02 00:16:13 -0400
commit8f63ca2d23c7922b24d7b95e54740ec29c859379 (patch)
tree4ff0bf8a8a5bf6fa4777e5778f1fe02e1243e820 /net/ceph/osd_client.c
parent0d5af1643535508f82d6bcc2b9b93b180e8c3f4b (diff)
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>
Diffstat (limited to 'net/ceph/osd_client.c')
-rw-r--r--net/ceph/osd_client.c4
1 files 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,
249 dst->watch.flag = src->watch.flag; 249 dst->watch.flag = src->watch.flag;
250 break; 250 break;
251 default: 251 default:
252 pr_err("unrecognized osd opcode %d\n", dst->op); 252 pr_err("unrecognized osd opcode %d\n", src->op);
253 WARN_ON(1); 253 WARN_ON(1);
254 break; 254 break;
255 case CEPH_OSD_OP_MAPEXT: 255 case CEPH_OSD_OP_MAPEXT:
@@ -307,7 +307,7 @@ static void osd_req_encode_op(struct ceph_osd_request *req,
307 case CEPH_OSD_OP_PGLS: 307 case CEPH_OSD_OP_PGLS:
308 case CEPH_OSD_OP_PGLS_FILTER: 308 case CEPH_OSD_OP_PGLS_FILTER:
309 pr_err("unsupported osd opcode %s\n", 309 pr_err("unsupported osd opcode %s\n",
310 ceph_osd_op_name(dst->op)); 310 ceph_osd_op_name(src->op));
311 WARN_ON(1); 311 WARN_ON(1);
312 break; 312 break;
313 } 313 }