From: Ying Xue <ying.xue@windriver.com>
To: <davem@davemloft.net>
Cc: jon.maloy@ericsson.com, Paul.Gortmaker@windriver.com,
tipc-discussion@lists.sourceforge.net, netdev@vger.kernel.org
Subject: [PATCH net-next 09/10] tipc: use node_list_lock to protect tipc_num_nodes variable
Date: Thu, 27 Mar 2014 12:54:38 +0800 [thread overview]
Message-ID: <1395896080-7926-10-git-send-email-ying.xue@windriver.com> (raw)
In-Reply-To: <1395896080-7926-1-git-send-email-ying.xue@windriver.com>
As tipc_node_list is protected by rcu read lock on read side, it's
unnecessary to hold node_list_lock to protect tipc_node_list in
tipc_node_get_links(). Instead, node_list_lock should just protects
tipc_num_nodes in the function.
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
---
net/tipc/node.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/tipc/node.c b/net/tipc/node.c
index 4f517ff..85405a6 100644
--- a/net/tipc/node.c
+++ b/net/tipc/node.c
@@ -352,11 +352,11 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
" (too many nodes)");
}
+ spin_unlock_bh(&node_list_lock);
+
buf = tipc_cfg_reply_alloc(payload_size);
- if (!buf) {
- spin_unlock_bh(&node_list_lock);
+ if (!buf)
return NULL;
- }
/* Add TLVs for all nodes in scope */
rcu_read_lock();
@@ -369,7 +369,6 @@ struct sk_buff *tipc_node_get_nodes(const void *req_tlv_area, int req_tlv_space)
&node_info, sizeof(node_info));
}
rcu_read_unlock();
- spin_unlock_bh(&node_list_lock);
return buf;
}
--
1.7.9.5
------------------------------------------------------------------------------
next prev parent reply other threads:[~2014-03-27 4:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-27 4:54 [PATCH net-next 00/10] clean up bearer and node layer Ying Xue
2014-03-27 4:54 ` [PATCH net-next 01/10] tipc: remove unnecessary checking for node object Ying Xue
2014-03-27 4:54 ` [PATCH net-next 02/10] tipc: obsolete the remote management feature Ying Xue
2014-03-27 4:54 ` [PATCH net-next 03/10] tipc: acquire necessary locks in named_cluster_distribute routine Ying Xue
2014-03-27 4:54 ` [PATCH net-next 04/10] tipc: convert tipc_bearers array to pointer list Ying Xue
2014-03-27 4:54 ` [PATCH net-next 05/10] tipc: remove active flag from tipc_bearer structure Ying Xue
2014-03-27 4:54 ` [PATCH net-next 06/10] tipc: make broadcast bearer store in bearer_list array Ying Xue
2014-03-27 4:54 ` [PATCH net-next 07/10] tipc: rename node create lock to protect node list and hlist Ying Xue
2014-03-27 4:54 ` [PATCH net-next 08/10] tipc: tipc: convert node list and node hlist to RCU lists Ying Xue
2014-03-27 4:54 ` Ying Xue [this message]
2014-03-27 4:54 ` [PATCH net-next 10/10] tipc: use node list lock to protect tipc_num_links variable Ying Xue
2014-03-27 17:12 ` [PATCH net-next 00/10] clean up bearer and node layer David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395896080-7926-10-git-send-email-ying.xue@windriver.com \
--to=ying.xue@windriver.com \
--cc=Paul.Gortmaker@windriver.com \
--cc=davem@davemloft.net \
--cc=jon.maloy@ericsson.com \
--cc=netdev@vger.kernel.org \
--cc=tipc-discussion@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).