From 6f6fd2f2de5c00bfe380eac4213538a6197a4043 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 30 Nov 2015 16:32:10 -0500 Subject: [PATCH] librbd: utilize common flush helper when closing parent images Signed-off-by: Jason Dillaman --- src/librbd/internal.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc index 9c25ba3add78..8d2e7945f732 100644 --- a/src/librbd/internal.cc +++ b/src/librbd/internal.cc @@ -2932,7 +2932,10 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type, ImageCtx *parent_ictx = ictx->parent; // AIO to the parent must be complete before closing - parent_ictx->flush_async_operations(); + { + RWLock::RLocker owner_locker(parent_ictx->owner_lock); + parent_ictx->flush(); + } parent_ictx->readahead.wait_for_pending(); { Mutex::Locker async_ops_locker(parent_ictx->async_ops_lock); -- 2.47.3