From: Sasha Levin Date: Sun, 27 Oct 2019 09:05:24 +0000 (-0400) Subject: Fix up botched backport of io_uring-fix-broken-links-with-offloading.patch X-Git-Tag: v4.4.198~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f309c743c87ff4b84ffe6ec3b2431869b6894065;p=thirdparty%2Fkernel%2Fstable-queue.git Fix up botched backport of io_uring-fix-broken-links-with-offloading.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.3/io_uring-fix-broken-links-with-offloading.patch b/queue-5.3/io_uring-fix-broken-links-with-offloading.patch index bc6e093e620..1aefed2f0fe 100644 --- a/queue-5.3/io_uring-fix-broken-links-with-offloading.patch +++ b/queue-5.3/io_uring-fix-broken-links-with-offloading.patch @@ -35,10 +35,10 @@ index 79f9c9f7b298e..518042cc6628b 100644 +static inline unsigned int io_sqring_entries(struct io_ring_ctx *ctx) +{ -+ struct io_rings *rings = ctx->rings; ++ struct io_sq_ring *ring = ctx->sq_ring; + + /* make sure SQ entry isn't read before tail */ -+ return smp_load_acquire(&rings->sq.tail) - ctx->cached_sq_head; ++ return smp_load_acquire(&ring->r.tail) - ctx->cached_sq_head; +} + /*