summaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-07-26 17:19:19 +0800
committerDavid Teigland <teigland@redhat.com>2010-08-05 14:22:01 -0500
commita4d935bd97b9ccf40aa0ec59646612df8ed46640 (patch)
treeb54f1179cb88227193fb7eeb278e82297fc68667 /fs/dlm
parentcdd854bc42b5e6c79bbbc40c6600d995ffe6e747 (diff)
downloadlinux-a4d935bd97b9ccf40aa0ec59646612df8ed46640.tar.bz2
dlm: use genl_register_family_with_ops()
Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/netlink.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 2c6ad518100d..ef17e0169da1 100644
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -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);
}