Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

librbd: remove unused member in FlattenRequest #19416

Merged
merged 1 commit into from Dec 11, 2017
Merged

librbd: remove unused member in FlattenRequest #19416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/librbd/Operations.cc
View file
Open in desktop
Expand Up @@ -405,16 +405,15 @@ void Operations<I>::execute_flatten(ProgressContext &prog_ctx,
assert(r == 0);
assert(overlap <= m_image_ctx.size);

uint64_t object_size = m_image_ctx.get_object_size();
uint64_t overlap_objects = Striper::get_num_objects(m_image_ctx.layout,
overlap);
uint64_t overlap_objects = Striper::get_num_objects(m_image_ctx.layout,
overlap);

m_image_ctx.parent_lock.put_read();
m_image_ctx.snap_lock.put_read();

operation::FlattenRequest<I> *req = new operation::FlattenRequest<I>(
m_image_ctx, new C_NotifyUpdate<I>(m_image_ctx, on_finish), object_size,
overlap_objects, snapc, prog_ctx);
m_image_ctx, new C_NotifyUpdate<I>(m_image_ctx, on_finish), overlap_objects,
snapc, prog_ctx);
req->send();
}

Expand Down
11 changes: 4 additions & 7 deletions src/librbd/operation/FlattenRequest.cc
View file
Open in desktop
Expand Up @@ -22,10 +22,9 @@ template <typename I>
class C_FlattenObject : public C_AsyncObjectThrottle<I> {
public:
C_FlattenObject(AsyncObjectThrottle<I> &throttle, I *image_ctx,
uint64_t object_size, ::SnapContext snapc, uint64_t object_no)
: C_AsyncObjectThrottle<I>(throttle, *image_ctx), m_object_size(object_size),
m_snapc(snapc), m_object_no(object_no)
{
::SnapContext snapc, uint64_t object_no)
: C_AsyncObjectThrottle<I>(throttle, *image_ctx), m_snapc(snapc),
m_object_no(object_no) {
}

int send() override {
Expand Down Expand Up @@ -55,7 +54,6 @@ class C_FlattenObject : public C_AsyncObjectThrottle<I> {
}

private:
uint64_t m_object_size;
::SnapContext m_snapc;
uint64_t m_object_no;
};
Expand Down Expand Up @@ -105,8 +103,7 @@ void FlattenRequest<I>::send_op() {
m_state = STATE_FLATTEN_OBJECTS;
typename AsyncObjectThrottle<I>::ContextFactory context_factory(
boost::lambda::bind(boost::lambda::new_ptr<C_FlattenObject<I> >(),
boost::lambda::_1, &image_ctx, m_object_size, m_snapc,
boost::lambda::_2));
boost::lambda::_1, &image_ctx, m_snapc, boost::lambda::_2));
AsyncObjectThrottle<I> *throttle = new AsyncObjectThrottle<I>(
this, image_ctx, context_factory, this->create_callback_context(), &m_prog_ctx,
0, m_overlap_objects);
Expand Down
13 changes: 5 additions & 8 deletions src/librbd/operation/FlattenRequest.h
View file
Open in desktop
Expand Up @@ -19,12 +19,10 @@ class FlattenRequest : public Request<ImageCtxT>
{
public:
FlattenRequest(ImageCtxT &image_ctx, Context *on_finish,
uint64_t object_size, uint64_t overlap_objects,
const ::SnapContext &snapc, ProgressContext &prog_ctx)
: Request<ImageCtxT>(image_ctx, on_finish), m_object_size(object_size),
m_overlap_objects(overlap_objects), m_snapc(snapc), m_prog_ctx(prog_ctx),
m_ignore_enoent(false)
{
uint64_t overlap_objects, const ::SnapContext &snapc,
ProgressContext &prog_ctx)
: Request<ImageCtxT>(image_ctx, on_finish), m_overlap_objects(overlap_objects),
m_snapc(snapc), m_prog_ctx(prog_ctx) {
}

protected:
Expand Down Expand Up @@ -69,14 +67,13 @@ class FlattenRequest : public Request<ImageCtxT>
STATE_UPDATE_CHILDREN
};

uint64_t m_object_size;
uint64_t m_overlap_objects;
::SnapContext m_snapc;
ProgressContext &m_prog_ctx;
State m_state = STATE_FLATTEN_OBJECTS;

ParentSpec m_parent_spec;
bool m_ignore_enoent;
bool m_ignore_enoent = false;

bool send_update_header();
bool send_update_children();
Expand Down