Commit df730ec2 authored by Xinghui Li's avatar Xinghui Li Committed by Jens Axboe
Browse files

io_uring: fix two assignments in if conditions 



Fixes two errors:

"ERROR: do not use assignment in if condition
130: FILE: io_uring/net.c:130:
+       if (!(issue_flags & IO_URING_F_UNLOCKED) &&

ERROR: do not use assignment in if condition
599: FILE: io_uring/poll.c:599:
+       } else if (!(issue_flags & IO_URING_F_UNLOCKED) &&"
reported by checkpatch.pl in net.c and poll.c .

Signed-off-by: default avatarXinghui Li <korantli@tencent.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/20221102082503.32236-1-korantwork@gmail.com


[axboe: style tweaks]
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 42385b02

io_uring/net.c

+9 −7
Original line number Diff line number Diff line
@@ -125,14 +125,16 @@ static struct io_async_msghdr *io_msg_alloc_async(struct io_kiocb *req, 
	struct io_cache_entry *entry;

	struct io_async_msghdr *hdr;



	if (!(issue_flags & IO_URING_F_UNLOCKED) &&

	    (entry = io_alloc_cache_get(&ctx->netmsg_cache)) != NULL) {

	if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		entry = io_alloc_cache_get(&ctx->netmsg_cache);

		if (entry) {

			hdr = container_of(entry, struct io_async_msghdr, cache);

			hdr->free_iov = NULL;

			req->flags |= REQ_F_ASYNC_DATA;

			req->async_data = hdr;

			return hdr;

		}

	}



	if (!io_alloc_async_data(req)) {

		hdr = req->async_data;

io_uring/poll.c

+5 −2
Original line number Diff line number Diff line
@@ -615,10 +615,13 @@ static struct async_poll *io_req_alloc_apoll(struct io_kiocb *req, 
	if (req->flags & REQ_F_POLLED) {

		apoll = req->apoll;

		kfree(apoll->double_poll);

	} else if (!(issue_flags & IO_URING_F_UNLOCKED) &&

		   (entry = io_alloc_cache_get(&ctx->apoll_cache)) != NULL) {

	} else if (!(issue_flags & IO_URING_F_UNLOCKED)) {

		entry = io_alloc_cache_get(&ctx->apoll_cache);

		if (entry == NULL)

			goto alloc_apoll;

		apoll = container_of(entry, struct async_poll, cache);

	} else {

alloc_apoll:

		apoll = kmalloc(sizeof(*apoll), GFP_ATOMIC);

		if (unlikely(!apoll))

			return NULL;