From bdf09f2007c12baa9a4da08b9c62c90e85ba7ce2 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 3 Jul 2012 09:03:53 -0700 Subject: [PATCH] OSD,ReplicatedPG::snap_trimmer: pg->put() in process, not snap_trimmer() This clarifies responsibility for the reference. Signed-off-by: Samuel Just --- src/osd/OSD.h | 1 + src/osd/ReplicatedPG.cc | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/osd/OSD.h b/src/osd/OSD.h index ca13f4ba6abbd..34021ff401130 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1045,6 +1045,7 @@ protected: } void _process(PG *pg) { pg->snap_trimmer(); + pg->put(); } void _clear() { osd->snap_trim_queue.clear(); diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index b4d5e97d129ca..3ba29d6baefc1 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -1424,7 +1424,6 @@ void ReplicatedPG::snap_trimmer() lock(); if (deleting) { unlock(); - put(); return; } dout(10) << "snap_trimmer entry" << dendl; @@ -1434,7 +1433,6 @@ void ReplicatedPG::snap_trimmer() dout(10) << " can't write, requeueing" << dendl; queue_snap_trim(); unlock(); - put(); return; } if (!scrub_block_writes) { @@ -1457,7 +1455,6 @@ void ReplicatedPG::snap_trimmer() queue_snap_trim(); } unlock(); - put(); return; } -- 2.39.5