Whamcloud - gitweb
LU-17976 build: fix nla_strnid() -Werror=missing-prototypes 37/55537/2
authorJian Yu <yujian@whamcloud.com>
Tue, 25 Jun 2024 23:07:30 +0000 (16:07 -0700)
committerOleg Drokin <green@whamcloud.com>
Mon, 8 Jul 2024 20:12:50 +0000 (20:12 +0000)
This patch explicitly defines nla_strnid() as a static function
to fix the following build failure:

  lnet/lnet/api-ni.c:2929:1: error:
  no previous prototype for 'nla_strnid' [-Werror=missing-prototypes]
   2929 | nla_strnid(struct nlattr **attr, struct lnet_nid *nid, int *rem,
        | ^~~~~~~~~~

It also fixes:
- lnet_fault_show_done()
- lnet_fault_show_start()
- lnet_fault_show_dump()
- __ll_dio_user_copy()
- ll_dio_user_copy_helper()

Change-Id: I0225794b3fac2f36aafadff783ca921fbc757edd
Fixes: f1c6623 ("LU-10391 lnet: Fault injection add/del ioctls to netlink")
Fixes: 1fa633c ("LU-17478 clio: parallelize unaligned DIO write copy")
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55537
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
lnet/lnet/api-ni.c
lustre/obdclass/cl_io.c

index 6fa34cb..0825c0b 100644 (file)
@@ -2925,7 +2925,7 @@ nla_extract_val(struct nlattr **attr, int *rem,
        RETURN(rc);
 }
 
-int
+static int
 nla_strnid(struct nlattr **attr, struct lnet_nid *nid, int *rem,
           struct netlink_ext_ack *extack)
 {
@@ -9294,7 +9294,7 @@ lnet_fault_dump_ctx(struct netlink_callback *cb)
        return (struct lnet_genl_fault_rule_list *)cb->args[0];
 }
 
-int lnet_fault_show_done(struct netlink_callback *cb)
+static int lnet_fault_show_done(struct netlink_callback *cb)
 {
        struct lnet_genl_fault_rule_list *rlist = lnet_fault_dump_ctx(cb);
 
@@ -9308,7 +9308,7 @@ int lnet_fault_show_done(struct netlink_callback *cb)
        RETURN(0);
 }
 
-int lnet_fault_show_start(struct netlink_callback *cb)
+static int lnet_fault_show_start(struct netlink_callback *cb)
 {
        struct genlmsghdr *gnlh = nlmsg_data(cb->nlh);
        struct netlink_ext_ack *extack = NULL;
@@ -9456,7 +9456,8 @@ static const struct ln_key_list fault_attr_list = {
        },
 };
 
-int lnet_fault_show_dump(struct sk_buff *msg, struct netlink_callback *cb)
+static int lnet_fault_show_dump(struct sk_buff *msg,
+                               struct netlink_callback *cb)
 {
        struct lnet_genl_fault_rule_list *rlist = lnet_fault_dump_ctx(cb);
 #ifdef HAVE_NL_PARSE_WITH_EXT_ACK
index 3c28112..2fd6ca3 100644 (file)
@@ -1465,7 +1465,7 @@ EXPORT_SYMBOL(ll_release_user_pages);
 #endif
 
 /* copy IO data to/from internal buffer and userspace iovec */
-ssize_t __ll_dio_user_copy(struct cl_sub_dio *sdio)
+static ssize_t __ll_dio_user_copy(struct cl_sub_dio *sdio)
 {
        struct iov_iter *iter = &sdio->csd_iter;
        struct ll_dio_pages *pvec = &sdio->csd_dio_pages;
@@ -1615,7 +1615,7 @@ struct dio_user_copy_data {
        ssize_t ducd_result;
 };
 
-int ll_dio_user_copy_helper(void *data)
+static int ll_dio_user_copy_helper(void *data)
 {
        struct dio_user_copy_data *ducd = data;
        struct cl_sub_dio *sdio = ducd->ducd_sdio;