Commit 938a73b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* '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()
parents 45480aa7 f70cb33b

fs/dlm/lowcomms.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static struct connection *assoc2con(int assoc_id) 


	for (i = 0 ; i < CONN_HASH_SIZE; i++) {

		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);

				return con;

			}

fs/dlm/netlink.c

+1 −14
Original line number Diff line number Diff line
@@ -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);

}