Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cdecbb33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kvack.org/~bcrl/aio-fixes 

Pull aio nested sleep annotation from Ben LaHaise,

* git://git.kvack.org/~bcrl/aio-fixes:
  aio: annotate aio_read_event_ring for sleep patterns
parents 4e02370f 9c9ce763

fs/aio.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -1140,6 +1140,13 @@ static long aio_read_events_ring(struct kioctx *ctx, 
	long ret = 0;

	long ret = 0;

	int copy_ret;

	int copy_ret;





	/*

	 * The mutex can block and wake us up and that will cause

	 * wait_event_interruptible_hrtimeout() to schedule without sleeping

	 * and repeat. This should be rare enough that it doesn't cause

	 * peformance issues. See the comment in read_events() for more detail.

	 */

	sched_annotate_sleep();

	mutex_lock(&ctx->ring_lock);

	mutex_lock(&ctx->ring_lock);





	/* Access to ->ring_pages here is protected by ctx->ring_lock. */

	/* Access to ->ring_pages here is protected by ctx->ring_lock. */