From patchwork Mon Feb 1 03:31:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 576332 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A164D140BA6 for ; Mon, 1 Feb 2016 14:29:51 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753294AbcBAD3L (ORCPT ); Sun, 31 Jan 2016 22:29:11 -0500 Received: from mail1.windriver.com ([147.11.146.13]:42482 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752635AbcBAD3K (ORCPT ); Sun, 31 Jan 2016 22:29:10 -0500 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.1) with ESMTPS id u113T8Mb003462 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Sun, 31 Jan 2016 19:29:08 -0800 (PST) Received: from sustaining-1.corp.ad.wrs.com (128.224.162.225) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.248.2; Sun, 31 Jan 2016 19:29:07 -0800 From: To: , , , , Subject: [PATCH 1/1] bond: relocate rcu_read_lock and rcu_read_unlock Date: Mon, 1 Feb 2016 11:31:12 +0800 Message-ID: <1454297472-24261-1-git-send-email-zyjzyj2000@gmail.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhu Yanjun rcu_read_lock and rcu_read_unlock are to protect the function bond_miimon_inspect. As such, moving rcu_read_lock and rcu_read_unlock to the function bond_miimon_inspect to make the source code compact. CC: Jay Vosburgh CC: Veaceslav Falico CC: Andy Gospodarek Signed-off-by: Zhu Yanjun --- drivers/net/bonding/bond_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 56b5605..4043181 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2022,6 +2022,7 @@ static int bond_miimon_inspect(struct bonding *bond) struct slave *slave; bool ignore_updelay; + rcu_read_lock(); ignore_updelay = !rcu_dereference(bond->curr_active_slave); bond_for_each_slave_rcu(bond, slave, iter) { @@ -2113,6 +2114,8 @@ static int bond_miimon_inspect(struct bonding *bond) } } + rcu_read_unlock(); + return commit; } @@ -2231,12 +2234,9 @@ static void bond_mii_monitor(struct work_struct *work) if (!bond_has_slaves(bond)) goto re_arm; - rcu_read_lock(); - should_notify_peers = bond_should_notify_peers(bond); if (bond_miimon_inspect(bond)) { - rcu_read_unlock(); /* Race avoidance with bond_close cancel of workqueue */ if (!rtnl_trylock()) { @@ -2248,8 +2248,7 @@ static void bond_mii_monitor(struct work_struct *work) bond_miimon_commit(bond); rtnl_unlock(); /* might sleep, hold no other locks */ - } else - rcu_read_unlock(); + } re_arm: if (bond->params.miimon)