From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jens Axboe <axboe@kernel.dk>, David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Josef Bacik <josef@toxicpanda.com>,
Johannes Berg <johannes.berg@intel.com>
Subject: linux-next: build failure after merge of the block tree
Date: Tue, 18 Apr 2017 13:02:29 +1000 [thread overview]
Message-ID: <20170418130229.04289bd6@canb.auug.org.au> (raw)
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
next reply other threads:[~2017-04-18 3:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 3:02 Stephen Rothwell [this message]
2017-05-02 1:07 ` linux-next: build failure after merge of the block tree 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170418130229.04289bd6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).