diff options
Diffstat (limited to 'src/librbd/AioRequest.cc')
| -rw-r--r-- | src/librbd/AioRequest.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/librbd/AioRequest.cc b/src/librbd/AioRequest.cc index 11e111f7514..b5e38b5ab0d 100644 --- a/src/librbd/AioRequest.cc +++ b/src/librbd/AioRequest.cc @@ -21,15 +21,14 @@ namespace librbd { AioRequest::AioRequest() : m_ictx(NULL), m_ioctx(NULL), m_object_no(0), m_object_off(0), m_object_len(0), - m_snap_id(CEPH_NOSNAP), m_completion(NULL), m_parent_completion(NULL), + m_completion(NULL), m_parent_completion(NULL), m_hide_enoent(false) {} AioRequest::AioRequest(ImageCtx *ictx, const std::string &oid, uint64_t objectno, uint64_t off, uint64_t len, - librados::snap_t snap_id, Context *completion, bool hide_enoent) : m_ictx(ictx), m_ioctx(&ictx->data_ctx), m_oid(oid), m_object_no(objectno), - m_object_off(off), m_object_len(len), m_snap_id(snap_id), + m_object_off(off), m_object_len(len), m_completion(completion), m_parent_completion(NULL), m_hide_enoent(hide_enoent) {} @@ -108,21 +107,18 @@ namespace librbd { /** read **/ AbstractWrite::AbstractWrite() - : m_state(LIBRBD_AIO_WRITE_FLAT), - m_parent_overlap(0) {} + : m_state(LIBRBD_AIO_WRITE_FLAT) {} AbstractWrite::AbstractWrite(ImageCtx *ictx, const std::string &oid, uint64_t object_no, uint64_t object_off, uint64_t len, vector<pair<uint64_t,uint64_t> >& objectx, - uint64_t object_overlap, - const ::SnapContext &snapc, librados::snap_t snap_id, + const ::SnapContext &snapc, Context *completion, bool hide_enoent) - : AioRequest(ictx, oid, object_no, object_off, len, snap_id, completion, + : AioRequest(ictx, oid, object_no, object_off, len, completion, hide_enoent), m_state(LIBRBD_AIO_WRITE_FLAT), m_snap_seq(snapc.seq.val) { m_object_image_extents = objectx; - m_parent_overlap = object_overlap; // TODO: find a way to make this less stupid for (std::vector<snapid_t>::const_iterator it = snapc.snaps.begin(); @@ -172,7 +168,6 @@ namespace librbd { break; } - // If parent still exists, overlap might also have changed. uint64_t newlen = m_ictx->prune_parent_extents( m_object_image_extents, m_ictx->parent_md.overlap); |