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.

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

librbd: add override in header files #13536

Merged
merged 1 commit into from Feb 21, 2017

Conversation

liuchang0812
Copy link
Contributor

@liuchang0812
Copy link
Contributor Author

@dillaman @liewegas Please take a look. as we talked in #13437

virtual void send_object_cache_requests(const ObjectExtents &object_extents,
uint64_t journal_tid);
void send_object_cache_requests(const ObjectExtents &object_extents,
uint64_t journal_tid) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done


virtual void send_object_requests(const ObjectExtents &object_extents,
void send_object_requests(const ObjectExtents &object_extents,
const ::SnapContext &snapc,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

bool synchronous);
virtual void update_stats(size_t length);
uint64_t append_journal_event(const AioObjectRequests &requests,
bool synchronous) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

uint64_t journal_tid);
uint32_t get_object_cache_request_count(bool journaling) const override;
void send_object_cache_requests(const ObjectExtents &object_extents,
uint64_t journal_tid) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

bool synchronous);
virtual void update_stats(size_t length);
uint64_t append_journal_event(const AioObjectRequests &requests,
bool synchronous) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@@ -114,11 +114,11 @@ class Watcher {

WatchCtx(Watcher &parent) : watcher(parent) {}

virtual void handle_notify(uint64_t notify_id,
void handle_notify(uint64_t notify_id,
uint64_t handle,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Context *on_finish);
virtual void aio_flush(Context *on_finish);
void aio_read(Extents&& image_extents, ceph::bufferlist *bl,
int fadvise_flags, Context *on_finish) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

void aio_read(Extents&& image_extents, ceph::bufferlist *bl,
int fadvise_flags, Context *on_finish) override;
void aio_write(Extents&& image_extents, ceph::bufferlist&& bl,
int fadvise_flags, Context *on_finish) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

void aio_write(Extents&& image_extents, ceph::bufferlist&& bl,
int fadvise_flags, Context *on_finish) override;
void aio_discard(uint64_t offset, uint64_t length,
Context *on_finish) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

virtual void handle_notify(uint64_t notify_id, uint64_t handle,
uint64_t notifier_id, bufferlist &bl);
void handle_notify(uint64_t notify_id, uint64_t handle,
uint64_t notifier_id, bufferlist &bl) override;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indentation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@liuchang0812
Copy link
Contributor Author

@dillaman what's wrong with indentation

@dillaman
Copy link

@liuchang0812 The params on the next line should align with the params on the previous line -- they don't now after the "virtual " keyword was removed.

@liuchang0812
Copy link
Contributor Author

@dillaman thanks I don't know how to fix this by clang-tidy automatically , I will correct it by hands tomorrow

@liuchang0812 liuchang0812 force-pushed the wip-add-override-in-rbd-headers branch 2 times, most recently from 4ef0b22 to 15a7402 Compare February 21, 2017 03:51
virtual void pre_release_lock_handler(bool shutting_down,
Context *on_finish) {
void pre_release_lock_handler(bool shutting_down,
Context *on_finish) override {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@liuchang0812
Copy link
Contributor Author

@dillaman It seems that I have fixed all indentation problems. Could you take a look again. Very thanks.

@liuchang0812
Copy link
Contributor Author

There are some CE because I rebased branch. I'm fixing it.

Fixes: http://tracker.ceph.com/issues/19012

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm -- thanks!

@dillaman dillaman merged commit e2f14be into ceph:master Feb 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants