lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  fs/dlm: Drop unnecessary null test
  dlm: use genl_register_family_with_ops()
This commit is contained in:
Linus Torvalds
2010-08-07 12:56:48 -07:00
parent 45480aa75b f70cb33b9c
commit 938a73b959
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fs/dlm/lowcomms.c
View File

@@ -248,7 +248,7 @@ static struct connection *assoc2con(int assoc_id)
for (i = 0 ; i < CONN_HASH_SIZE; i++) { for (i = 0 ; i < CONN_HASH_SIZE; i++) {
hlist_for_each_entry(con, h, &connection_hash[i], list) { hlist_for_each_entry(con, h, &connection_hash[i], list) {
if (con && con->sctp_assoc == assoc_id) { if (con->sctp_assoc == assoc_id) {
mutex_unlock(&connections_lock); mutex_unlock(&connections_lock);
return con; return con;
} }

15
fs/dlm/netlink.c
View File

@@ -81,24 +81,11 @@ static struct genl_ops dlm_nl_ops = {
int __init dlm_netlink_init(void) int __init dlm_netlink_init(void)
{ {
int rv; return genl_register_family_with_ops(&family, &dlm_nl_ops, 1);
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;
} }
void dlm_netlink_exit(void) void dlm_netlink_exit(void)
{ {
genl_unregister_ops(&family, &dlm_nl_ops);
genl_unregister_family(&family); genl_unregister_family(&family);
} }