target/user: Fix up smatch warnings in tcmu_netlink_event
authorNicholas Bellinger <nab@linux-iscsi.org>
Thu, 2 Oct 2014 06:01:15 +0000 (23:01 -0700)
committerNicholas Bellinger <nab@linux-iscsi.org>
Fri, 3 Oct 2014 18:16:11 +0000 (11:16 -0700)
This patch fixes up the following unused return smatch warnings:

  drivers/target/target_core_user.c:778 tcmu_netlink_event warn: unused return: ret = nla_put_string()
  drivers/target/target_core_user.c:780 tcmu_netlink_event warn: unused `return: ret = nla_put_u32()

(Fix up missing semicolon: grover)

Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_user.c

index 6608ecf9457030bfb39205bf7553f7f301179499..ac37ce6be15c39f885b03f8f04662104ea38ec54 100644 (file)
@@ -763,27 +763,27 @@ static int tcmu_netlink_event(enum tcmu_genl_cmd cmd, const char *name, int mino
 {
        struct sk_buff *skb;
        void *msg_header;
-       int ret;
+       int ret = -ENOMEM;
 
        skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL);
        if (!skb)
-               return -ENOMEM;
+               return ret;
 
        msg_header = genlmsg_put(skb, 0, 0, &tcmu_genl_family, 0, cmd);
-       if (!msg_header) {
-               nlmsg_free(skb);
-               return -ENOMEM;
-       }
+       if (!msg_header)
+               goto free_skb;
 
        ret = nla_put_string(skb, TCMU_ATTR_DEVICE, name);
+       if (ret < 0)
+               goto free_skb;
 
        ret = nla_put_u32(skb, TCMU_ATTR_MINOR, minor);
+       if (ret < 0)
+               goto free_skb;
 
        ret = genlmsg_end(skb, msg_header);
-       if (ret < 0) {
-               nlmsg_free(skb);
-               return ret;
-       }
+       if (ret < 0)
+               goto free_skb;
 
        ret = genlmsg_multicast(&tcmu_genl_family, skb, 0,
                                TCMU_MCGRP_CONFIG, GFP_KERNEL);
@@ -793,6 +793,9 @@ static int tcmu_netlink_event(enum tcmu_genl_cmd cmd, const char *name, int mino
                ret = 0;
 
        return ret;
+free_skb:
+       nlmsg_free(skb);
+       return ret;
 }
 
 static int tcmu_configure_device(struct se_device *dev)