| Message ID | 20220105140208.365608-17-eesposit@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | job: replace AioContext lock with job_mutex | expand |
On 1/5/22 15:02, Emanuele Giuseppe Esposito wrote: > +++ b/blockjob.c > @@ -335,13 +335,13 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp) > info = g_new0(BlockJobInfo, 1); > info->type = g_strdup(job_type_str(&job->job)); > info->device = g_strdup(job->job.id); > - info->busy = qatomic_read(&job->job.busy); > + info->busy = job->job.busy; > info->paused = job->job.pause_count > 0; > info->offset = progress_current; > info->len = progress_total; > info->speed = job->speed; > info->io_status = job->iostatus; > - info->ready = job_is_ready(&job->job), > + info->ready = job_is_ready_locked(&job->job), This second part belongs earlier in the series, I think? Paolo
diff --git a/blockjob.c b/blockjob.c index 468ba735c5..d1d8808a56 100644 --- a/blockjob.c +++ b/blockjob.c @@ -335,13 +335,13 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp) info = g_new0(BlockJobInfo, 1); info->type = g_strdup(job_type_str(&job->job)); info->device = g_strdup(job->job.id); - info->busy = qatomic_read(&job->job.busy); + info->busy = job->job.busy; info->paused = job->job.pause_count > 0; info->offset = progress_current; info->len = progress_total; info->speed = job->speed; info->io_status = job->iostatus; - info->ready = job_is_ready(&job->job), + info->ready = job_is_ready_locked(&job->job), info->status = job->job.status; info->auto_finalize = job->job.auto_finalize; info->auto_dismiss = job->job.auto_dismiss;
Not sure what the atomic here was supposed to do, since job.busy is protected by the job lock. Since the whole function is called under job_mutex, just remove the atomic. Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> --- blockjob.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)