diff options
| author | Eric Dumazet | 2010-10-29 03:52:46 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-11-08 22:50:07 +0100 |
| commit | e4a7b93bd5d84e1e79917d024d17d745d190fc9a (patch) | |
| tree | 84a80b1b60ca952498a6e8e5587256a5bb8d54cf /drivers/net/bonding/bond_main.c | |
| parent | aoe: remove dev_base_lock use from aoecmd_cfg_pkts() (diff) | |
| download | kernel-qcow2-linux-e4a7b93bd5d84e1e79917d024d17d745d190fc9a.tar.gz kernel-qcow2-linux-e4a7b93bd5d84e1e79917d024d17d745d190fc9a.tar.xz kernel-qcow2-linux-e4a7b93bd5d84e1e79917d024d17d745d190fc9a.zip | |
bonding: remove dev_base_lock use
bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure
device doesn’t disappear. Same goal can be achieved using RCU.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index bdb68a600382..518844852f06 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3209,7 +3209,7 @@ out: #ifdef CONFIG_PROC_FS static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) - __acquires(&dev_base_lock) + __acquires(RCU) __acquires(&bond->lock) { struct bonding *bond = seq->private; @@ -3218,7 +3218,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) int i; /* make sure the bond won't be taken away */ - read_lock(&dev_base_lock); + rcu_read_lock(); read_lock(&bond->lock); if (*pos == 0) @@ -3248,12 +3248,12 @@ static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos) static void bond_info_seq_stop(struct seq_file *seq, void *v) __releases(&bond->lock) - __releases(&dev_base_lock) + __releases(RCU) { struct bonding *bond = seq->private; read_unlock(&bond->lock); - read_unlock(&dev_base_lock); + rcu_read_unlock(); } static void bond_info_show_master(struct seq_file *seq) |