2020-06-26 23:34:09

by Randy Dunlap

Subject: [PATCH] io_uring: fix function args for !CONFIG_NET

From: Randy Dunlap <[email protected]>

Fix build errors when CONFIG_NET is not set/enabled:

../fs/io_uring.c:5472:10: error: too many arguments to function ‘io_sendmsg’
../fs/io_uring.c:5474:10: error: too many arguments to function ‘io_send’
../fs/io_uring.c:5484:10: error: too many arguments to function ‘io_recvmsg’
../fs/io_uring.c:5486:10: error: too many arguments to function ‘io_recv’
../fs/io_uring.c:5510:9: error: too many arguments to function ‘io_accept’
../fs/io_uring.c:5518:9: error: too many arguments to function ‘io_connect’

Signed-off-by: Randy Dunlap <[email protected]>
Cc: Jens Axboe <[email protected]>
Cc: [email protected]
---
fs/io_uring.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)

--- mmotm-2020-0625-2036.orig/fs/io_uring.c
+++ mmotm-2020-0625-2036/fs/io_uring.c
@@ -4315,12 +4315,14 @@ static int io_sendmsg_prep(struct io_kio
return -EOPNOTSUPP;
}

-static int io_sendmsg(struct io_kiocb *req, bool force_nonblock)
+static int io_sendmsg(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}

-static int io_send(struct io_kiocb *req, bool force_nonblock)
+static int io_send(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}
@@ -4331,12 +4333,14 @@ static int io_recvmsg_prep(struct io_kio
return -EOPNOTSUPP;
}

-static int io_recvmsg(struct io_kiocb *req, bool force_nonblock)
+static int io_recvmsg(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}

-static int io_recv(struct io_kiocb *req, bool force_nonblock)
+static int io_recv(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}
@@ -4346,7 +4350,8 @@ static int io_accept_prep(struct io_kioc
return -EOPNOTSUPP;
}

-static int io_accept(struct io_kiocb *req, bool force_nonblock)
+static int io_accept(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}
@@ -4356,7 +4361,8 @@ static int io_connect_prep(struct io_kio
return -EOPNOTSUPP;
}

-static int io_connect(struct io_kiocb *req, bool force_nonblock)
+static int io_connect(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
{
return -EOPNOTSUPP;
}

2020-06-27 01:47:24

by Jens Axboe

Subject: Re: [PATCH] io_uring: fix function args for !CONFIG_NET

On 6/26/20 5:32 PM, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Fix build errors when CONFIG_NET is not set/enabled:
>
> ../fs/io_uring.c:5472:10: error: too many arguments to function ‘io_sendmsg’
> ../fs/io_uring.c:5474:10: error: too many arguments to function ‘io_send’
> ../fs/io_uring.c:5484:10: error: too many arguments to function ‘io_recvmsg’
> ../fs/io_uring.c:5486:10: error: too many arguments to function ‘io_recv’
> ../fs/io_uring.c:5510:9: error: too many arguments to function ‘io_accept’
> ../fs/io_uring.c:5518:9: error: too many arguments to function ‘io_connect’

Thanks Randy, applied.

--
Jens Axboe