Merge pull request #14830 from runsisi/wip-open-cleanup

librbd: remove redundant check for image id emptiness

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2017-05-05 13:16:35 -04:00 committed by GitHub
commit bcae20d662

View File

@ -121,7 +121,6 @@ Context *OpenRequest<I>::handle_v2_detect_header(int *result) {
template <typename I>
void OpenRequest<I>::send_v2_get_id() {
if (m_image_ctx->id.empty()) {
CephContext *cct = m_image_ctx->cct;
ldout(cct, 10) << this << " " << __func__ << dendl;
@ -135,9 +134,6 @@ void OpenRequest<I>::send_v2_get_id() {
m_image_ctx->md_ctx.aio_operate(util::id_obj_name(m_image_ctx->name),
comp, &op, &m_out_bl);
comp->release();
} else {
send_v2_get_name();
}
}
template <typename I>