diff options
| author | Jens Axboe <axboe@kernel.dk> | 2022-03-12 06:50:13 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-03-12 06:50:13 -0700 |
| commit | f3b6a41eb2bbdf545a42e54d637c34f4b1fdf5b9 (patch) | |
| tree | b9e08fb774b65018428f0a1f94832397dbad4c1f /fs/io_uring.c | |
| parent | bcbb7bf6ccde7cb969a5642879832bc84ebf06a3 (diff) | |
| download | lwn-f3b6a41eb2bbdf545a42e54d637c34f4b1fdf5b9.tar.gz lwn-f3b6a41eb2bbdf545a42e54d637c34f4b1fdf5b9.zip | |
io_uring: remove duplicated member check for io_msg_ring_prep()
Julia and the kernel test robot report that the prep handling for this
command inadvertently checks one field twice:
fs/io_uring.c:4338:42-56: duplicated argument to && or ||
Get rid of it.
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Fixes: 4f57f06ce218 ("io_uring: add support for IORING_OP_MSG_RING command")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/io_uring.c')
| -rw-r--r-- | fs/io_uring.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/io_uring.c b/fs/io_uring.c index 229b31d644ef..299154efcd8a 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -4389,9 +4389,8 @@ static int io_nop(struct io_kiocb *req, unsigned int issue_flags) static int io_msg_ring_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { - if (unlikely(sqe->addr || sqe->ioprio || sqe->buf_index || - sqe->rw_flags || sqe->splice_fd_in || sqe->buf_index || - sqe->personality)) + if (unlikely(sqe->addr || sqe->ioprio || sqe->rw_flags || + sqe->splice_fd_in || sqe->buf_index || sqe->personality)) return -EINVAL; if (req->file->f_op != &io_uring_fops) |