linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH -next] fs: io_uring: build when CONFIG_NET is disabled
@ 2021-02-10 17:37 Randy Dunlap
  2021-02-10 17:38 ` Pavel Begunkov
  0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2021-02-10 17:37 UTC (permalink / raw)
  To: linux-kernel; +Cc: Randy Dunlap, Pavel Begunkov, Jens Axboe, linux-fsdevel

Fix build errors when CONFIG_NET is not enabled.

Fixes: b268c951abf8 ("io_uring: don't propagate io_comp_state")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-fsdevel@vger.kernel.org
---
 fs/io_uring.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

--- linux-next-20210210.orig/fs/io_uring.c
+++ linux-next-20210210/fs/io_uring.c
@@ -5145,14 +5145,12 @@ static int io_sendmsg_prep(struct io_kio
 	return -EOPNOTSUPP;
 }
 
-static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags,
-		      struct io_comp_state *cs)
+static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }
 
-static int io_send(struct io_kiocb *req, unsigned int issue_flags,
-		   struct io_comp_state *cs)
+static int io_send(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }
@@ -5163,14 +5161,12 @@ static int io_recvmsg_prep(struct io_kio
 	return -EOPNOTSUPP;
 }
 
-static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags,
-		      struct io_comp_state *cs)
+static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }
 
-static int io_recv(struct io_kiocb *req, unsigned int issue_flags,
-		   struct io_comp_state *cs)
+static int io_recv(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }
@@ -5180,8 +5176,7 @@ static int io_accept_prep(struct io_kioc
 	return -EOPNOTSUPP;
 }
 
-static int io_accept(struct io_kiocb *req, unsigned int issue_flags,
-		     struct io_comp_state *cs)
+static int io_accept(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }
@@ -5191,8 +5186,7 @@ static int io_connect_prep(struct io_kio
 	return -EOPNOTSUPP;
 }
 
-static int io_connect(struct io_kiocb *req, unsigned int issue_flags,
-		      struct io_comp_state *cs)
+static int io_connect(struct io_kiocb *req, unsigned int issue_flags)
 {
 	return -EOPNOTSUPP;
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH -next] fs: io_uring: build when CONFIG_NET is disabled
  2021-02-10 17:37 [PATCH -next] fs: io_uring: build when CONFIG_NET is disabled Randy Dunlap
@ 2021-02-10 17:38 ` Pavel Begunkov
  0 siblings, 0 replies; 2+ messages in thread
From: Pavel Begunkov @ 2021-02-10 17:38 UTC (permalink / raw)
  To: Randy Dunlap, linux-kernel; +Cc: Jens Axboe, linux-fsdevel

On 10/02/2021 17:37, Randy Dunlap wrote:
> Fix build errors when CONFIG_NET is not enabled.

Thanks, but already fixed up.

> 
> Fixes: b268c951abf8 ("io_uring: don't propagate io_comp_state")
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Pavel Begunkov <asml.silence@gmail.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/io_uring.c |   18 ++++++------------
>  1 file changed, 6 insertions(+), 12 deletions(-)
> 
> --- linux-next-20210210.orig/fs/io_uring.c
> +++ linux-next-20210210/fs/io_uring.c
> @@ -5145,14 +5145,12 @@ static int io_sendmsg_prep(struct io_kio
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags,
> -		      struct io_comp_state *cs)
> +static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_send(struct io_kiocb *req, unsigned int issue_flags,
> -		   struct io_comp_state *cs)
> +static int io_send(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
> @@ -5163,14 +5161,12 @@ static int io_recvmsg_prep(struct io_kio
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags,
> -		      struct io_comp_state *cs)
> +static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_recv(struct io_kiocb *req, unsigned int issue_flags,
> -		   struct io_comp_state *cs)
> +static int io_recv(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
> @@ -5180,8 +5176,7 @@ static int io_accept_prep(struct io_kioc
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_accept(struct io_kiocb *req, unsigned int issue_flags,
> -		     struct io_comp_state *cs)
> +static int io_accept(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
> @@ -5191,8 +5186,7 @@ static int io_connect_prep(struct io_kio
>  	return -EOPNOTSUPP;
>  }
>  
> -static int io_connect(struct io_kiocb *req, unsigned int issue_flags,
> -		      struct io_comp_state *cs)
> +static int io_connect(struct io_kiocb *req, unsigned int issue_flags)
>  {
>  	return -EOPNOTSUPP;
>  }
> 

-- 
Pavel Begunkov

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-02-10 17:44 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-10 17:37 [PATCH -next] fs: io_uring: build when CONFIG_NET is disabled Randy Dunlap
2021-02-10 17:38 ` Pavel Begunkov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).