Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next

[firefly-linux-kernel-4.4.55.git] / fs / dlm / netlink.c

diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 2c6ad518100d509d2d0013ff466370a585559986..60a327863b1122e246b79bf91ecdf23136eccac9 100644 (file)
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -14,7 +14,7 @@
 #include "dlm_internal.h"
 
 static uint32_t dlm_nl_seqnum;
-static uint32_t listener_nlpid;
+static uint32_t listener_nlportid;
 
 static struct genl_family family = {
        .id             = GENL_ID_GENERATE,
@@ -64,13 +64,13 @@ static int send_data(struct sk_buff *skb)
                return rv;
        }
 
-       return genlmsg_unicast(&init_net, skb, listener_nlpid);
+       return genlmsg_unicast(&init_net, skb, listener_nlportid);
 }
 
 static int user_cmd(struct sk_buff *skb, struct genl_info *info)
 {
-       listener_nlpid = info->snd_pid;
-       printk("user_cmd nlpid %u\n", listener_nlpid);
+       listener_nlportid = info->snd_portid;
+       printk("user_cmd nlpid %u\n", listener_nlportid);
        return 0;
 }
 
@@ -81,24 +81,11 @@ static struct genl_ops dlm_nl_ops = {
 
 int __init dlm_netlink_init(void)
 {
-       int rv;
-
-       rv = genl_register_family(&family);
-       if (rv)
-               return rv;
-
-       rv = genl_register_ops(&family, &dlm_nl_ops);
-       if (rv < 0)
-               goto err;
-       return 0;
- err:
-       genl_unregister_family(&family);
-       return rv;
+       return genl_register_family_with_ops(&family, &dlm_nl_ops, 1);
 }
 
 void dlm_netlink_exit(void)
 {
-       genl_unregister_ops(&family, &dlm_nl_ops);
        genl_unregister_family(&family);
 }