From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 13 Mar 2023 13:23:07 +0000 (+0100)
Subject: osd: remove unused OSDOp::soid member
X-Git-Tag: v19.0.0~1433^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a41dbaed0e1d315b11e3d3a979eb8ffc9f28f615;p=ceph.git

osd: remove unused OSDOp::soid member

The src_oids comment became outdated in 2011 with a082747c650e ("osd:
make CLONERANGE src oid encoding more sane").  Multi-object OSD ops
were ripped out entirely a few years later with 0d7b0b7b5204 ("src/:
remove CLONE_RANGE, ASSERT_SRC_VERSION, SRC_CMPXATTR").

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/osd/osd_op_util.cc b/src/osd/osd_op_util.cc
index a33e2f110d0d..54d47fecd2be 100644
--- a/src/osd/osd_op_util.cc
+++ b/src/osd/osd_op_util.cc
@@ -111,10 +111,6 @@ int OpInfo::set_from_op(
     if (ceph_osd_op_mode_read(iter->op.op))
       set_read();
 
-    // set READ flag if there are src_oids
-    if (iter->soid.oid.name.length())
-      set_read();
-
     // set PGOP flag if there are PG ops
     if (ceph_osd_op_type_pg(iter->op.op))
       set_pg_op();
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index ce370c0b7dcb..3a59c10f9189 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4080,7 +4080,6 @@ std::ostream& operator<<(std::ostream& out, const ObjectCleanRegions& ocr);
 
 struct OSDOp {
   ceph_osd_op op;
-  sobject_t soid;
 
   ceph::buffer::list indata, outdata;
   errorcode32_t rval;