From 9382be6ea4b3785bcc3a4868e1f69348157ba5b1 Mon Sep 17 00:00:00 2001 From: Jeffrey Cody Date: Tue, 28 Aug 2018 21:08:16 +0200 Subject: [PATCH 03/29] block: for jobs, do not clear user_paused until after the resume RH-Author: Jeffrey Cody Message-id: Patchwork-id: 81957 O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/3] block: for jobs, do not clear user_paused until after the resume Bugzilla: 1605026 RH-Acked-by: Max Reitz RH-Acked-by: John Snow RH-Acked-by: Miroslav Rezanina The function job_cancel_async() will always cause an assert for blockjob user resume. We set job->user_paused to false, and then call job->driver->user_resume(). In the case of blockjobs, this is the block_job_user_resume() function. In that function, we assert that job.user_paused is set to true. Unfortunately, right before calling this function, it has explicitly been set to false. The fix is pretty simple: set job->user_paused to false only after the job user_resume() function has been called. Reviewed-by: John Snow Reviewed-by: Eric Blake Signed-off-by: Jeff Cody Message-id: bb183b77d8f2dd6bd67b8da559a90ac1e74b2052.1534868459.git.jcody@redhat.com Signed-off-by: Jeff Cody (cherry picked from commit e321c0597c7590499bacab239d7f86e257f96bcd) Signed-off-by: Jeff Cody Signed-off-by: Miroslav Rezanina --- job.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/job.c b/job.c index 84e1402..95dc998 100644 --- a/job.c +++ b/job.c @@ -727,10 +727,10 @@ static void job_cancel_async(Job *job, bool force) { if (job->user_paused) { /* Do not call job_enter here, the caller will handle it. */ - job->user_paused = false; if (job->driver->user_resume) { job->driver->user_resume(job); } + job->user_paused = false; assert(job->pause_count > 0); job->pause_count--; } -- 1.8.3.1