diff options
| author | Theofilos Mouratidis <t.mour@cern.ch> | 2018-10-03 13:42:26 +0200 |
|---|---|---|
| committer | Jason Dillaman <dillaman@redhat.com> | 2019-01-11 15:18:45 +0100 |
| commit | b6f9aab03713410dd1b50edc7fc1d71242ac3e74 (patch) | |
| tree | ac1c468c3ba58298805eb9c39b4fd2ce62560274 /src/librbd/internal.cc | |
| parent | Merge PR #25898 into master (diff) | |
| download | ceph-b6f9aab03713410dd1b50edc7fc1d71242ac3e74.tar.xz ceph-b6f9aab03713410dd1b50edc7fc1d71242ac3e74.zip | |
librbd: add trash purge api calls
Add trash purge api calls and fix the docs of some other rbd trash functions
Signed-off-by: Theofilos Mouratidis <mtheofilos@gmail.com>
Diffstat (limited to 'src/librbd/internal.cc')
| -rw-r--r-- | src/librbd/internal.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index ccb38aed5e4..8b499c283da 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -1135,8 +1135,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) { } int lock_break(ImageCtx *ictx, rbd_lock_mode_t lock_mode, - const std::string &lock_owner) - { + const std::string &lock_owner) { CephContext *cct = ictx->cct; ldout(cct, 20) << __func__ << ": ictx=" << ictx << ", " << "lock_mode=" << lock_mode << ", " @@ -1527,7 +1526,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) { if (throttle.pending_error()) { return throttle.wait_for_ret(); } - + { RWLock::RLocker snap_locker(src->snap_lock); if (src->object_map != nullptr) { @@ -1545,7 +1544,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) { } else { object_id += src->stripe_count; } - } + } uint64_t len = min(period, src_size - offset); bufferlist *bl = new bufferlist(); @@ -2006,4 +2005,3 @@ std::ostream &operator<<(std::ostream &os, const librbd::ImageOptions &opts) { return os; } - |