Merge pull request #8661 from runsisi/wip-fix-snapc-validation

librbd: put the validation of image snap context earlier

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2016-04-29 08:38:34 -05:00
commit dd459e701d

View File

@ -245,6 +245,12 @@ Context *RefreshRequest<I>::handle_v2_get_mutable_metadata(int *result) {
return m_on_finish;
}
if (!m_snapc.is_valid()) {
lderr(cct) << "image snap context is invalid!" << dendl;
*result = -EIO;
return m_on_finish;
}
send_v2_get_flags();
return nullptr;
}
@ -352,12 +358,6 @@ Context *RefreshRequest<I>::handle_v2_get_snapshots(int *result) {
return m_on_finish;
}
if (!m_snapc.is_valid()) {
lderr(cct) << "image snap context is invalid!" << dendl;
*result = -EIO;
return m_on_finish;
}
return send_v2_refresh_parent();
}