RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 10:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4423 from ceph/wip-11370

Browse Source 
librbd: better handling for duplicate flatten requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
This commit is contained in:
Josh Durgin 2015-04-21 10:23:44 -07:00
commit 0c278d7a3c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/librbd/internal.cc
View File

@ -2628,6 +2628,14 @@ reprotect_and_return_err:
return r;
}
{
RWLock::RLocker parent_locker(ictx->parent_lock);
if (ictx->parent_md.spec.pool_id == -1) {
lderr(cct) << "image has no parent" << dendl;
return -EINVAL;
}
}
uint64_t request_id = ictx->async_request_seq.inc();
r = invoke_async_request(ictx, "flatten",
boost::bind(&async_flatten, ictx, _1,
@ -2636,9 +2644,13 @@ reprotect_and_return_err:
ictx->image_watcher, request_id,
boost::ref(prog_ctx)));
if (r < 0 && r != -EINVAL) {
return r;
}
notify_change(ictx->md_ctx, ictx->header_oid, ictx);
ldout(cct, 20) << "flatten finished" << dendl;
return r;
return 0;
}
int async_flatten(ImageCtx *ictx, Context *ctx, ProgressContext &prog_ctx)