projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
net
/
ipv4
/
multipath_wrandom.c
diff --git
a/net/ipv4/multipath_wrandom.c
b/net/ipv4/multipath_wrandom.c
index
d34a9fa
..
d25ec4a
100644
(file)
--- a/
net/ipv4/multipath_wrandom.c
+++ b/
net/ipv4/multipath_wrandom.c
@@
-12,7
+12,6
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
-#include <linux/config.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <linux/types.h>
#include <asm/system.h>
#include <asm/uaccess.h>
#include <linux/types.h>
@@
-228,7
+227,7
@@
static void wrandom_set_nhinfo(__u32 network,
struct multipath_dest *d, *target_dest = NULL;
/* store the weight information for a certain route */
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) {
/* find state entry for gateway or add one if necessary */
list_for_each_entry_rcu(r, &state[state_idx].head, list) {
@@
-276,7
+275,7
@@
static void wrandom_set_nhinfo(__u32 network,
* we are finished
*/
* we are finished
*/
- spin_unlock(&state[state_idx].lock);
+ spin_unlock
_bh
(&state[state_idx].lock);
}
static void __multipath_free(struct rcu_head *head)
}
static void __multipath_free(struct rcu_head *head)
@@
-302,7
+301,7
@@
static void wrandom_flush(void)
for (i = 0; i < MULTIPATH_STATE_SIZE; ++i) {
struct multipath_route *r;
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) {
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
+314,7
@@
static void wrandom_flush(void)
__multipath_free);
}
__multipath_free);
}
- spin_unlock(&state[i].lock);
+ spin_unlock
_bh
(&state[i].lock);
}
}
}
}