| Message ID | 20210210173740.22328-1-rdunlap@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] fs: io_uring: build when CONFIG_NET is disabled | expand |
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; > } >
--- 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; }
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(-)