Skip to contentSkip to conversation

dlm: use genl_register_family_with_ops()

PATCH In review Changli Gao 2 participants 2 messages Jul 26, 2010 Distributed lock manager (DLM)

lore
Share & tools
lore

Changli Gao

author
#0 lore raw

PATCH 1/1 dlm: use genl_register_family_with_ops()

Signed-off-by Changli Gao <[email protected]>

----

 fs/dlm/netlink.c |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
fs/dlm/netlink.c +1 -14
index 2c6ad51..ef17e01 100644
@@ -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);
 }
maintainer
#1 lore raw
Quoted 23 lines · Changli Gao
Signed-off-by Changli Gao <[email protected]>

----

 fs/dlm/netlink.c |   15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)
fs/dlm/netlink.c +0 -11
index 2c6ad51..ef17e01 100644
@@ -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:

fs/dlm/netlink.c static struct genl_ops dlm_nl_ops = { · line 90

Quoted 10 lines
fs/dlm/netlink.c +1 -3
-	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);
 }

Looks fine, ack.
Dave