From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Jun 2021 03:14:06 +0000 (+1000)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=19370ff183fd26fbdb9bde1f59c169ff4fbeeb90;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'block/for-next'
---

19370ff183fd26fbdb9bde1f59c169ff4fbeeb90
diff --cc fs/io_uring.c
index 903458afd56c,a1ca6badff36..273b2dd7890a
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -9119,10 -9111,8 +9119,11 @@@ void __io_uring_cancel(struct files_str
  	struct io_uring_task *tctx = current->io_uring;
  	DEFINE_WAIT(wait);
  	s64 inflight;
+ 	bool cancel_all = !files;
  
 +	if (tctx->io_wq)
 +		io_wq_exit_start(tctx->io_wq);
 +
  	/* make sure overflow events are dropped */
  	atomic_inc(&tctx->in_idle);
  	do {