From c31c8e26d48deb741933d63cd822427946484b02 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Sat, 17 Aug 2019 15:19:46 +0800 Subject: [PATCH] osd/PrimaryLogPG: kill obsolete ondisk_{read,write}_lock comments The ondisk_{read,write}_lock infrastructure was long gone with https://github.com/ceph/ceph/pull/20177 merged - c244300ef33a044ad71fea7d92d77f33b5d41851, to be specific. Hence the related comments must die since they could be super-misleading. Signed-off-by: xie xingguo --- src/osd/PrimaryLogPG.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 23f6dc52211..a1e04de867b 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -12631,11 +12631,6 @@ int PrimaryLogPG::prep_object_replica_pushes( ceph_assert(!recovering.count(soid)); recovering.insert(make_pair(soid, obc)); - /* We need this in case there is an in progress write on the object. In fact, - * the only possible write is an update to the xattr due to a lost_revert -- - * a client write would be blocked since the object is degraded. - * In almost all cases, therefore, this lock should be uncontended. - */ int r = pgbackend->recover_object( soid, v, @@ -13191,7 +13186,6 @@ int PrimaryLogPG::prep_backfill_object_push( start_recovery_op(oid); recovering.insert(make_pair(oid, obc)); - // We need to take the read_lock here in order to flush in-progress writes int r = pgbackend->recover_object( oid, v, -- 2.47.3