block: Allow wait_serialising_requests() at any point
commit6460440f34c709461b84375cfd8a86b27d433225
authorKevin Wolf <kwolf@redhat.com>
Fri, 13 Dec 2013 12:04:35 +0000 (13 13:04 +0100)
committerKevin Wolf <kwolf@redhat.com>
Fri, 24 Jan 2014 16:40:02 +0000 (24 17:40 +0100)
treea1bd62cb84945fbd5fb1719be49cd5558405e1fa
parent7327145f63a224c9ba9c16d0c29781feffef8dc6
block: Allow wait_serialising_requests() at any point

We can only have a single wait_serialising_requests() call per request
because otherwise we can run into deadlocks where requests are waiting
for each other. The same is true when wait_serialising_requests() is not
at the very beginning of a request, so that other requests can be issued
between the start of the tracking and wait_serialising_requests().

Fix this by changing wait_serialising_requests() to ignore requests that
are already (directly or indirectly) waiting for the calling request.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
block.c
include/block/block_int.h