diff --git a/fs/io_uring.c b/fs/io_uring.c
index 98243d7f5f3daa34b6e9ae4c21f0d46b0f5838aa..c06b0c0808abc364cf03ddcde58f660f515dd4f5 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2335,6 +2335,12 @@ static int io_write(struct io_kiocb *req, struct io_kiocb **nxt,
 			ret2 = call_write_iter(req->file, kiocb, &iter);
 		else
 			ret2 = loop_rw_iter(WRITE, req->file, kiocb, &iter);
+		/*
+		 * Raw bdev writes will -EOPNOTSUPP for IOCB_NOWAIT. Just
+		 * retry them without IOCB_NOWAIT.
+		 */
+		if (ret2 == -EOPNOTSUPP && (kiocb->ki_flags & IOCB_NOWAIT))
+			ret2 = -EAGAIN;
 		if (!force_nonblock || ret2 != -EAGAIN) {
 			kiocb_done(kiocb, ret2, nxt, req->in_async);
 		} else {