devlink: use nla_put_failure goto label instead of out

BugLink: http://bugs.launchpad.net/bugs/1676388
Be aligned with the rest of the code and use label named nla_put_failure.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 1a6aa36b6f92b1a2f2e6789f6785372d4d6ddca9)
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/net/core/devlink.c b/net/core/devlink.c
index f36192406f9a469d130265e45026f53546f8adbc..7f88cc879d434ba5083cc0a78a2829369966ad0e 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -1408,29 +1408,29 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink,
 
        err = devlink_nl_put_handle(msg, devlink);
        if (err)
-               goto out;
+               goto nla_put_failure;
 
        err = ops->eswitch_mode_get(devlink, &mode);
        if (err)
-               goto out;
+               goto nla_put_failure;
        err = nla_put_u16(msg, DEVLINK_ATTR_ESWITCH_MODE, mode);
        if (err)
-               goto out;
+               goto nla_put_failure;
 
        if (ops->eswitch_inline_mode_get) {
                err = ops->eswitch_inline_mode_get(devlink, &inline_mode);
                if (err)
-                       goto out;
+                       goto nla_put_failure;
                err = nla_put_u8(msg, DEVLINK_ATTR_ESWITCH_INLINE_MODE,
                                 inline_mode);
                if (err)
-                       goto out;
+                       goto nla_put_failure;
        }
 
        genlmsg_end(msg, hdr);
        return 0;
 
-out:
+nla_put_failure:
        genlmsg_cancel(msg, hdr);
        return err;
 }