diff options
author | Gregory Farnum <greg@inktank.com> | 2013-10-01 10:23:17 -0700 |
---|---|---|
committer | Gregory Farnum <greg@inktank.com> | 2013-10-01 10:23:17 -0700 |
commit | bf4234c0bea7733a2f58ebfb03c782e2e82bd494 (patch) | |
tree | 2f68ebbbaf66b9eb97dd42186b9e96f88082b784 | |
parent | 3d062c2a238e458f65a71f442eb4de349ea0cde3 (diff) | |
parent | 75b94ba2953169cd7cd458df5a0f6b844504d1f9 (diff) | |
download | ceph-bf4234c0bea7733a2f58ebfb03c782e2e82bd494.tar.gz |
Merge pull request #663 from ceph/wip-cancel-copy
Reviewed-by: Greg Farnum <greg@inktank.com>
-rw-r--r-- | src/osd/ReplicatedPG.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 5e099c0853d..fcaca434ba8 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4583,10 +4583,9 @@ void ReplicatedPG::cancel_copy(CopyOpRef cop) void ReplicatedPG::cancel_copy_ops() { dout(10) << __func__ << dendl; - for (map<hobject_t,CopyOpRef>::iterator p = copy_ops.begin(); - p != copy_ops.end(); - copy_ops.erase(p++)) { - cancel_copy(p->second); + map<hobject_t,CopyOpRef>::iterator p = copy_ops.begin(); + while (p != copy_ops.end()) { + cancel_copy((p++)->second); } } |