diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-23 21:34:28 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-30 16:54:16 -0700 |
| commit | 8ba50c0e95f94bd7e5407205beba4e2e3446ffdf (patch) | |
| tree | 03d8f3c61ce8e00768f6979929e2a989960bcffb | |
| parent | 6473060e693731408b4ed8e0e7f1f15e99cb0dea (diff) | |
| download | ceph-8ba50c0e95f94bd7e5407205beba4e2e3446ffdf.tar.gz | |
osd/ReplicatedPG: drop src_obc.clear() calls
These are all about to go out of scope; no need to clear them
explicitly.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/ReplicatedPG.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 4a8f24dadd6..e5d50ef28b4 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -836,7 +836,6 @@ void ReplicatedPG::do_op(OpRequestRef op) dout(10) << "no src oid specified for multi op " << osd_op << dendl; osd->reply_op_error(op, -EINVAL); } - src_obc.clear(); return; } @@ -867,7 +866,6 @@ void ReplicatedPG::do_op(OpRequestRef op) src_obc[clone_oid] = sobc; continue; } - src_obc.clear(); return; } else { continue; @@ -910,7 +908,6 @@ void ReplicatedPG::do_op(OpRequestRef op) const eversion_t& oldv = entry->version; dout(3) << "do_op dup " << ctx->reqid << " was " << oldv << dendl; delete ctx; - src_obc.clear(); if (already_complete(oldv)) { osd->reply_op_error(op, 0, oldv, entry->user_version); } else { @@ -988,7 +985,6 @@ void ReplicatedPG::do_op(OpRequestRef op) if (result == -EAGAIN) { // clean up after the ctx delete ctx; - src_obc.clear(); return; } @@ -996,7 +992,6 @@ void ReplicatedPG::do_op(OpRequestRef op) if (ctx->delta_stats.num_bytes > 0 && pool.info.get_flags() & pg_pool_t::FLAG_FULL) { delete ctx; - src_obc.clear(); osd->reply_op_error(op, -ENOSPC); return; } @@ -1043,7 +1038,6 @@ void ReplicatedPG::do_op(OpRequestRef op) reply->add_flags(CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK); osd->send_message_osd_client(reply, m->get_connection()); delete ctx; - src_obc.clear(); return; } |