* linux-next: build failure after merge of the block tree
@ 2017-04-18 3:02 Stephen Rothwell
2017-05-02 1:07 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2017-04-18 3:02 UTC (permalink / raw)
To: Jens Axboe, David Miller, Networking
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Josef Bacik,
Johannes Berg
Hi all,
After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
drivers/block/nbd.c: In function 'nbd_genl_connect':
drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
^
In file included from include/net/rtnetlink.h:5:0,
from include/net/sch_generic.h:12,
from include/linux/filter.h:20,
from include/net/sock.h:64,
from drivers/block/nbd.c:32:
include/net/netlink.h:754:19: note: declared here
static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
^
drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
^
In file included from include/net/rtnetlink.h:5:0,
from include/net/sch_generic.h:12,
from include/linux/filter.h:20,
from include/net/sock.h:64,
from drivers/block/nbd.c:32:
include/net/netlink.h:754:19: note: declared here
static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
^
Caused by commits
e46c7287b1c2 ("nbd: add a basic netlink interface")
b7aa3d39385d ("nbd: add a reconfigure netlink command")
interacting with commit
fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
from the net-next tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Apr 2017 12:59:05 +1000
Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/block/nbd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b78f23ce2395..5049d19f3940 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
goto out;
}
ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
- nbd_sock_policy);
+ nbd_sock_policy, NULL);
if (ret != 0) {
printk(KERN_ERR "nbd: error processing sock list\n");
ret = -EINVAL;
@@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
goto out;
}
ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
- nbd_sock_policy);
+ nbd_sock_policy, NULL);
if (ret != 0) {
printk(KERN_ERR "nbd: error processing sock list\n");
ret = -EINVAL;
--
2.11.0
--
Cheers,
Stephen Rothwell
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the block tree
2017-04-18 3:02 linux-next: build failure after merge of the block tree Stephen Rothwell
@ 2017-05-02 1:07 ` Stephen Rothwell
2017-05-02 1:09 ` Jens Axboe
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2017-05-02 1:07 UTC (permalink / raw)
To: Jens Axboe, David Miller, Networking
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Josef Bacik,
Johannes Berg, Linus
Hi all,
On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> drivers/block/nbd.c: In function 'nbd_genl_connect':
> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> ^
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/sch_generic.h:12,
> from include/linux/filter.h:20,
> from include/net/sock.h:64,
> from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
> ^
> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> ^
> In file included from include/net/rtnetlink.h:5:0,
> from include/net/sch_generic.h:12,
> from include/linux/filter.h:20,
> from include/net/sock.h:64,
> from drivers/block/nbd.c:32:
> include/net/netlink.h:754:19: note: declared here
> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
> ^
>
> Caused by commits
>
> e46c7287b1c2 ("nbd: add a basic netlink interface")
> b7aa3d39385d ("nbd: add a reconfigure netlink command")
>
> interacting with commit
>
> fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
>
> from the net-next tree.
>
> I have applied the following merge fix patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 18 Apr 2017 12:59:05 +1000
> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/block/nbd.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index b78f23ce2395..5049d19f3940 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
> goto out;
> }
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> - nbd_sock_policy);
> + nbd_sock_policy, NULL);
> if (ret != 0) {
> printk(KERN_ERR "nbd: error processing sock list\n");
> ret = -EINVAL;
> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
> goto out;
> }
> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
> - nbd_sock_policy);
> + nbd_sock_policy, NULL);
> if (ret != 0) {
> printk(KERN_ERR "nbd: error processing sock list\n");
> ret = -EINVAL;
> --
> 2.11.0
So, this merge fix is now needed when the net-next tree is merged (as
Linus has merged the block tree).
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the block tree
2017-05-02 1:07 ` Stephen Rothwell
@ 2017-05-02 1:09 ` Jens Axboe
2017-05-02 1:37 ` Stephen Rothwell
0 siblings, 1 reply; 8+ messages in thread
From: Jens Axboe @ 2017-05-02 1:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux-Next Mailing List,
Linux Kernel Mailing List, Josef Bacik, Johannes Berg, Linus
> On May 1, 2017, at 7:07 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
>> On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the block tree, today's linux-next build (powerpc
>> ppc64_defconfig) failed like this:
>>
>> drivers/block/nbd.c: In function 'nbd_genl_connect':
>> drivers/block/nbd.c:1662:10: error: too few arguments to function 'nla_parse_nested'
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> ^
>> In file included from include/net/rtnetlink.h:5:0,
>> from include/net/sch_generic.h:12,
>> from include/linux/filter.h:20,
>> from include/net/sock.h:64,
>> from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>> ^
>> drivers/block/nbd.c: In function 'nbd_genl_reconfigure':
>> drivers/block/nbd.c:1818:10: error: too few arguments to function 'nla_parse_nested'
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> ^
>> In file included from include/net/rtnetlink.h:5:0,
>> from include/net/sch_generic.h:12,
>> from include/linux/filter.h:20,
>> from include/net/sock.h:64,
>> from drivers/block/nbd.c:32:
>> include/net/netlink.h:754:19: note: declared here
>> static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
>> ^
>>
>> Caused by commits
>>
>> e46c7287b1c2 ("nbd: add a basic netlink interface")
>> b7aa3d39385d ("nbd: add a reconfigure netlink command")
>>
>> interacting with commit
>>
>> fceb6435e852 ("netlink: pass extended ACK struct to parsing functions")
>>
>> from the net-next tree.
>>
>> I have applied the following merge fix patch:
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Tue, 18 Apr 2017 12:59:05 +1000
>> Subject: [PATCH] nbd: fix up for nla_parse_nested() API change
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/block/nbd.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
>> index b78f23ce2395..5049d19f3940 100644
>> --- a/drivers/block/nbd.c
>> +++ b/drivers/block/nbd.c
>> @@ -1660,7 +1660,7 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
>> goto out;
>> }
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> - nbd_sock_policy);
>> + nbd_sock_policy, NULL);
>> if (ret != 0) {
>> printk(KERN_ERR "nbd: error processing sock list\n");
>> ret = -EINVAL;
>> @@ -1816,7 +1816,7 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info)
>> goto out;
>> }
>> ret = nla_parse_nested(socks, NBD_SOCK_MAX, attr,
>> - nbd_sock_policy);
>> + nbd_sock_policy, NULL);
>> if (ret != 0) {
>> printk(KERN_ERR "nbd: error processing sock list\n");
>> ret = -EINVAL;
>> --
>> 2.11.0
>
> So, this merge fix is now needed when the net-next tree is merged (as
> Linus has merged the block tree).
Indeed, I have warned Linus about it. Thanks Stephen.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the block tree
2017-05-02 1:09 ` Jens Axboe
@ 2017-05-02 1:37 ` Stephen Rothwell
2017-05-02 1:45 ` Jens Axboe
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2017-05-02 1:37 UTC (permalink / raw)
To: Jens Axboe
Cc: David Miller, Networking, Linux-Next Mailing List,
Linux Kernel Mailing List, Josef Bacik, Johannes Berg, Linus
Hi Jens,
On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>
> Indeed, I have warned Linus about it. Thanks Stephen.
Thanks.
BTW, (unusually) I did not see your pull request(s) ...
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the block tree
2017-05-02 1:37 ` Stephen Rothwell
@ 2017-05-02 1:45 ` Jens Axboe
0 siblings, 0 replies; 8+ messages in thread
From: Jens Axboe @ 2017-05-02 1:45 UTC (permalink / raw)
To: Stephen Rothwell
Cc: David Miller, Networking, Linux-Next Mailing List,
Linux Kernel Mailing List, Josef Bacik, Johannes Berg, Linus
On May 1, 2017, at 7:37 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi Jens,
>
>> On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <axboe@kernel.dk> wrote:
>>
>> Indeed, I have warned Linus about it. Thanks Stephen.
>
> Thanks.
>
> BTW, (unusually) I did not see your pull request(s) ...
I CC'ed linux-block, so they showed up there at least.
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: build failure after merge of the block tree
@ 2020-12-07 3:09 Stephen Rothwell
2020-12-07 20:09 ` Florent Revest
2020-12-14 20:29 ` Stephen Rothwell
0 siblings, 2 replies; 8+ messages in thread
From: Stephen Rothwell @ 2020-12-07 3:09 UTC (permalink / raw)
To: Jens Axboe, Daniel Borkmann, Alexei Starovoitov, Networking
Cc: David Miller, Jakub Kicinski, Florent Revest, Florent Revest,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]
Hi all,
After merging the block tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/io_uring.c: In function 'io_shutdown':
fs/io_uring.c:3782:9: error: too many arguments to function 'sock_from_file'
3782 | sock = sock_from_file(req->file, &ret);
| ^~~~~~~~~~~~~~
In file included from fs/io_uring.c:63:
include/linux/net.h:243:16: note: declared here
243 | struct socket *sock_from_file(struct file *file);
| ^~~~~~~~~~~~~~
Caused by commit
36f4fa6886a8 ("io_uring: add support for shutdown(2)")
interacting with commit
dba4a9256bb4 ("net: Remove the err argument from sock_from_file")
from the bpf-next tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2020 14:04:10 +1100
Subject: [PATCH] fixup for "net: Remove the err argument from sock_from_file"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/io_uring.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index cd997264dbab..91d08408f1fe 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req, bool force_nonblock)
if (force_nonblock)
return -EAGAIN;
- sock = sock_from_file(req->file, &ret);
+ sock = sock_from_file(req->file);
if (unlikely(!sock))
- return ret;
+ return -ENOTSOCK;
ret = __sys_shutdown_sock(sock, req->shutdown.how);
io_req_complete(req, ret);
--
2.29.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the block tree
2020-12-07 3:09 Stephen Rothwell
@ 2020-12-07 20:09 ` Florent Revest
2020-12-14 20:29 ` Stephen Rothwell
1 sibling, 0 replies; 8+ messages in thread
From: Florent Revest @ 2020-12-07 20:09 UTC (permalink / raw)
To: Stephen Rothwell, Jens Axboe, Daniel Borkmann,
Alexei Starovoitov, Networking
Cc: David Miller, Jakub Kicinski, Florent Revest,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, 2020-12-07 at 14:09 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/io_uring.c: In function 'io_shutdown':
> fs/io_uring.c:3782:9: error: too many arguments to function
> 'sock_from_file'
> 3782 | sock = sock_from_file(req->file, &ret);
> | ^~~~~~~~~~~~~~
> In file included from fs/io_uring.c:63:
> include/linux/net.h:243:16: note: declared here
> 243 | struct socket *sock_from_file(struct file *file);
> | ^~~~~~~~~~~~~~
>
> Caused by commit
>
> 36f4fa6886a8 ("io_uring: add support for shutdown(2)")
>
> interacting with commit
>
> dba4a9256bb4 ("net: Remove the err argument from sock_from_file")
>
> from the bpf-next tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Dec 2020 14:04:10 +1100
> Subject: [PATCH] fixup for "net: Remove the err argument from
> sock_from_file"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/io_uring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index cd997264dbab..91d08408f1fe 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req,
> bool force_nonblock)
> if (force_nonblock)
> return -EAGAIN;
>
> - sock = sock_from_file(req->file, &ret);
> + sock = sock_from_file(req->file);
> if (unlikely(!sock))
> - return ret;
> + return -ENOTSOCK;
>
> ret = __sys_shutdown_sock(sock, req->shutdown.how);
> io_req_complete(req, ret);
> --
> 2.29.2
Thanks Stephen, this looks good to me.
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the block tree
2020-12-07 3:09 Stephen Rothwell
2020-12-07 20:09 ` Florent Revest
@ 2020-12-14 20:29 ` Stephen Rothwell
1 sibling, 0 replies; 8+ messages in thread
From: Stephen Rothwell @ 2020-12-14 20:29 UTC (permalink / raw)
To: Jens Axboe, Daniel Borkmann, Alexei Starovoitov, Networking
Cc: David Miller, Jakub Kicinski, Florent Revest, Florent Revest,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1834 bytes --]
Hi all,
On Mon, 7 Dec 2020 14:09:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the block tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/io_uring.c: In function 'io_shutdown':
> fs/io_uring.c:3782:9: error: too many arguments to function 'sock_from_file'
> 3782 | sock = sock_from_file(req->file, &ret);
> | ^~~~~~~~~~~~~~
> In file included from fs/io_uring.c:63:
> include/linux/net.h:243:16: note: declared here
> 243 | struct socket *sock_from_file(struct file *file);
> | ^~~~~~~~~~~~~~
>
> Caused by commit
>
> 36f4fa6886a8 ("io_uring: add support for shutdown(2)")
>
> interacting with commit
>
> dba4a9256bb4 ("net: Remove the err argument from sock_from_file")
>
> from the bpf-next tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Dec 2020 14:04:10 +1100
> Subject: [PATCH] fixup for "net: Remove the err argument from sock_from_file"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/io_uring.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index cd997264dbab..91d08408f1fe 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -3779,9 +3779,9 @@ static int io_shutdown(struct io_kiocb *req, bool force_nonblock)
> if (force_nonblock)
> return -EAGAIN;
>
> - sock = sock_from_file(req->file, &ret);
> + sock = sock_from_file(req->file);
> if (unlikely(!sock))
> - return ret;
> + return -ENOTSOCK;
>
> ret = __sys_shutdown_sock(sock, req->shutdown.how);
> io_req_complete(req, ret);
Just a reminder that I am still applying this merge fix.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-14 20:30 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 3:02 linux-next: build failure after merge of the block tree Stephen Rothwell
2017-05-02 1:07 ` Stephen Rothwell
2017-05-02 1:09 ` Jens Axboe
2017-05-02 1:37 ` Stephen Rothwell
2017-05-02 1:45 ` Jens Axboe
2020-12-07 3:09 Stephen Rothwell
2020-12-07 20:09 ` Florent Revest
2020-12-14 20:29 ` Stephen Rothwell
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).