Commit d90dedfc authored by Jeff Cody's avatar Jeff Cody
Browse files

Merge branch 'block-next' into HEAD

parents be1f13ac cae98cb8

block/mirror.c

+4 −0
Original line number Diff line number Diff line
@@ -245,6 +245,10 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s) 
            trace_mirror_break_buf_busy(s, nb_chunks, s->in_flight);

            break;

        }

        if (IOV_MAX < nb_chunks + added_chunks) {

            trace_mirror_break_iov_max(s, nb_chunks, added_chunks);

            break;

        }



        /* We have enough free space to copy these sectors.  */

        bitmap_set(s->in_flight_bitmap, next_chunk, added_chunks);

trace-events

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ mirror_yield(void *s, int64_t cnt, int buf_free_count, int in_flight) "s %p dirt 
mirror_yield_in_flight(void *s, int64_t sector_num, int in_flight) "s %p sector_num %"PRId64" in_flight %d"

mirror_yield_buf_busy(void *s, int nb_chunks, int in_flight) "s %p requested chunks %d in_flight %d"

mirror_break_buf_busy(void *s, int nb_chunks, int in_flight) "s %p requested chunks %d in_flight %d"

mirror_break_iov_max(void *s, int nb_chunks, int added_chunks) "s %p requested chunks %d added_chunks %d"



# block/backup.c

backup_do_cow_enter(void *job, int64_t start, int64_t sector_num, int nb_sectors) "job %p start %"PRId64" sector_num %"PRId64" nb_sectors %d"