osdc/Objecter: clean up reduncant op assignmentswip-osd-alloc

add_op() sets the op code; the caller doesn't need to do it again.

Signed-off-by: Sage Weil <sage@inktank.com>

1 files changed, 0 insertions, 8 deletions

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 3f4c8dde3fe..1fd92057c41 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -87,14 +87,12 @@ struct ObjectOperation {
   }
   void add_data(int op, uint64_t off, uint64_t len, bufferlist& bl) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.extent.offset = off;
     osd_op.op.extent.length = len;
     osd_op.indata.claim_append(bl);
   }
   void add_clone_range(int op, uint64_t off, uint64_t len, const object_t& srcoid, uint64_t srcoff, snapid_t srcsnapid) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.clonerange.offset = off;
     osd_op.op.clonerange.length = len;
     osd_op.op.clonerange.src_offset = srcoff;
@@ -102,7 +100,6 @@ struct ObjectOperation {
   }
   void add_xattr(int op, const char *name, const bufferlist& data) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.xattr.name_len = (name ? strlen(name) : 0);
     osd_op.op.xattr.value_len = data.length();
     if (name)
@@ -111,7 +108,6 @@ struct ObjectOperation {
   }
   void add_xattr_cmp(int op, const char *name, uint8_t cmp_op, uint8_t cmp_mode, const bufferlist& data) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.xattr.name_len = (name ? strlen(name) : 0);
     osd_op.op.xattr.value_len = data.length();
     osd_op.op.xattr.cmp_op = cmp_op;
@@ -122,7 +118,6 @@ struct ObjectOperation {
   }
   void add_call(int op, const char *cname, const char *method, bufferlist &indata) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.cls.class_len = strlen(cname);
     osd_op.op.cls.method_len = strlen(method);
     osd_op.op.cls.indata_len = indata.length();
@@ -132,7 +127,6 @@ struct ObjectOperation {
   }
   void add_watch(int op, uint64_t cookie, uint64_t ver, uint8_t flag, bufferlist& inbl) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.watch.cookie = cookie;
     osd_op.op.watch.ver = ver;
     osd_op.op.watch.flag = flag;
@@ -140,14 +134,12 @@ struct ObjectOperation {
   }
   void add_pgls(int op, uint64_t count, collection_list_handle_t cookie, epoch_t start_epoch) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.pgls.count = count;
     osd_op.op.pgls.start_epoch = start_epoch;
     ::encode(cookie, osd_op.indata);
   }
   void add_pgls_filter(int op, uint64_t count, bufferlist& filter, collection_list_handle_t cookie, epoch_t start_epoch) {
     OSDOp& osd_op = add_op(op);
-    osd_op.op.op = op;
     osd_op.op.pgls.count = count;
     osd_op.op.pgls.start_epoch = start_epoch;
     string cname = "pg";