Commit 23d702d8 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

blockjob: drop block_job_pause/resume_all() 



Commit 81193349 ("block: Don't
block_job_pause_all() in bdrv_drain_all()") removed the only callers of
block_job_pause/resume_all().

Pausing and resuming now happens in child_job_drained_begin/end() so
it's no longer necessary to globally pause/resume jobs.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: 20180424085240.5798-1-stefanha@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent e5cd6952

blockjob.c

+0 −27
Original line number Diff line number Diff line
@@ -988,19 +988,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, 
    return job;

}



void block_job_pause_all(void)

{

    BlockJob *job = NULL;

    while ((job = block_job_next(job))) {

        AioContext *aio_context = blk_get_aio_context(job->blk);



        aio_context_acquire(aio_context);

        block_job_ref(job);

        block_job_pause(job);

        aio_context_release(aio_context);

    }

}



void block_job_early_fail(BlockJob *job)

{

    assert(job->status == BLOCK_JOB_STATUS_CREATED);
@@ -1078,20 +1065,6 @@ void coroutine_fn block_job_pause_point(BlockJob *job) 
    }

}



void block_job_resume_all(void)

{

    BlockJob *job, *next;



    QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {

        AioContext *aio_context = blk_get_aio_context(job->blk);



        aio_context_acquire(aio_context);

        block_job_resume(job);

        block_job_unref(job);

        aio_context_release(aio_context);

    }

}



/*

 * Conditionally enter a block_job pending a call to fn() while

 * under the block_job_lock critical section.

include/block/blockjob_int.h

+0 −14
Original line number Diff line number Diff line
@@ -168,20 +168,6 @@ void block_job_sleep_ns(BlockJob *job, int64_t ns); 
 */

void block_job_yield(BlockJob *job);



/**

 * block_job_pause_all:

 *

 * Asynchronously pause all jobs.

 */

void block_job_pause_all(void);



/**

 * block_job_resume_all:

 *

 * Resume all block jobs.  Must be paired with a preceding block_job_pause_all.

 */

void block_job_resume_all(void);



/**

 * block_job_early_fail:

 * @bs: The block device.