summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-23 21:34:28 -0700
committerSage Weil <sage@inktank.com>2013-08-26 16:17:10 -0700
commit17c2770a6981de27de0bffc7e01109e1598d0503 (patch)
tree16d535feceeefc77ea824c0a48ed19d8b5b15f35
parentb0c7f8958cd93f10f486d7774e7eee858f287a67 (diff)
downloadceph-17c2770a6981de27de0bffc7e01109e1598d0503.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.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 0f904c73a2d..84095e3e326 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;
@@ -909,7 +907,6 @@ void ReplicatedPG::do_op(OpRequestRef op)
if (oldv != eversion_t()) {
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);
} else {
@@ -985,7 +982,6 @@ void ReplicatedPG::do_op(OpRequestRef op)
if (result == -EAGAIN) {
// clean up after the ctx
delete ctx;
- src_obc.clear();
return;
}
@@ -993,7 +989,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;
}
@@ -1038,7 +1033,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;
}