Hi all,
On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
