diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 17:33:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 17:33:06 +0100 |
| commit | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (patch) | |
| tree | 8c21cc2ceaa11b7a6b023da6c8794f1e24eb0354 /net/ipv4/multipath_wrandom.c | |
| parent | [PATCH] IDE: always enable CONFIG_PDC202XX_FORCE (diff) | |
| parent | [NET]: Add CONFIG_NETDEBUG to suppress bad packet messages. (diff) | |
| download | linux-d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f.tar.xz linux-d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/ipv4/multipath_wrandom.c')
| -rw-r--r-- | net/ipv4/multipath_wrandom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/multipath_wrandom.c b/net/ipv4/multipath_wrandom.c index d34a9fa608e0..342d0b9098f5 100644 --- a/net/ipv4/multipath_wrandom.c +++ b/net/ipv4/multipath_wrandom.c @@ -228,7 +228,7 @@ static void wrandom_set_nhinfo(__u32 network, struct multipath_dest *d, *target_dest = NULL; /* store the weight information for a certain route */ - spin_lock(&state[state_idx].lock); + spin_lock_bh(&state[state_idx].lock); /* find state entry for gateway or add one if necessary */ list_for_each_entry_rcu(r, &state[state_idx].head, list) { @@ -276,7 +276,7 @@ static void wrandom_set_nhinfo(__u32 network, * we are finished */ - spin_unlock(&state[state_idx].lock); + spin_unlock_bh(&state[state_idx].lock); } static void __multipath_free(struct rcu_head *head) @@ -302,7 +302,7 @@ static void wrandom_flush(void) for (i = 0; i < MULTIPATH_STATE_SIZE; ++i) { struct multipath_route *r; - spin_lock(&state[i].lock); + spin_lock_bh(&state[i].lock); list_for_each_entry_rcu(r, &state[i].head, list) { struct multipath_dest *d; list_for_each_entry_rcu(d, &r->dests, list) { @@ -315,7 +315,7 @@ static void wrandom_flush(void) __multipath_free); } - spin_unlock(&state[i].lock); + spin_unlock_bh(&state[i].lock); } } |