req->error only used for iopoll
authorStefan Bühler <source@stbuehler.de>
Wed, 1 May 2019 11:53:36 +0000 (13:53 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 2 May 2019 20:08:54 +0000 (14:08 -0600)
No need to set it in io_poll_add; io_poll_complete doesn't use it to set
the result in the CQE.

Signed-off-by: Stefan Bühler <source@stbuehler.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
fs/io_uring.c

index 2a46de56d05cf121e97383f0c0a39fd28a23e110..d91cbd53d3ca4cc21f2420217dc48e6f0b8fe1c8 100644 (file)
@@ -333,7 +333,7 @@ struct io_kiocb {
 #define REQ_F_IO_DRAIN         32      /* drain existing IO first */
 #define REQ_F_IO_DRAINED       64      /* drain done */
        u64                     user_data;
-       u32                     error;
+       u32                     error;  /* iopoll result from callback */
        u32                     sequence;
 
        struct work_struct      work;
@@ -1520,7 +1520,6 @@ static int io_poll_add(struct io_kiocb *req, const struct io_uring_sqe *sqe)
                spin_unlock(&poll->head->lock);
        }
        if (mask) { /* no async, we'd stolen it */
-               req->error = mangle_poll(mask);
                ipt.error = 0;
                io_poll_complete(ctx, req, mask);
        }