Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33407
b: refs/heads/master
c: 6e8fcbf
h: refs/heads/master
i:
  33405: 62b0d8f
  33403: f02b275
  33399: 84b4759
  33391: 083d14a
  33375: 1985793
  33343: cca5cbe
  33279: e17f0e9
v: v3
  • Loading branch information
Alexey Kuznetsov authored and David S. Miller committed Aug 17, 2006
1 parent 1b90cdb commit a74fec0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: acd6e00b8e4db542cb6bc9ddfbb4e18bbe29ce4d
refs/heads/master: 6e8fcbf64024f9056ba122abbb66554aa76bae5d
12 changes: 6 additions & 6 deletions trunk/net/ipv4/fib_semantics.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ void free_fib_info(struct fib_info *fi)

void fib_release_info(struct fib_info *fi)
{
write_lock(&fib_info_lock);
write_lock_bh(&fib_info_lock);
if (fi && --fi->fib_treeref == 0) {
hlist_del(&fi->fib_hash);
if (fi->fib_prefsrc)
Expand All @@ -172,7 +172,7 @@ void fib_release_info(struct fib_info *fi)
fi->fib_dead = 1;
fib_info_put(fi);
}
write_unlock(&fib_info_lock);
write_unlock_bh(&fib_info_lock);
}

static __inline__ int nh_comp(const struct fib_info *fi, const struct fib_info *ofi)
Expand Down Expand Up @@ -598,7 +598,7 @@ static void fib_hash_move(struct hlist_head *new_info_hash,
unsigned int old_size = fib_hash_size;
unsigned int i, bytes;

write_lock(&fib_info_lock);
write_lock_bh(&fib_info_lock);
old_info_hash = fib_info_hash;
old_laddrhash = fib_info_laddrhash;
fib_hash_size = new_size;
Expand Down Expand Up @@ -639,7 +639,7 @@ static void fib_hash_move(struct hlist_head *new_info_hash,
}
fib_info_laddrhash = new_laddrhash;

write_unlock(&fib_info_lock);
write_unlock_bh(&fib_info_lock);

bytes = old_size * sizeof(struct hlist_head *);
fib_hash_free(old_info_hash, bytes);
Expand Down Expand Up @@ -820,7 +820,7 @@ fib_create_info(const struct rtmsg *r, struct kern_rta *rta,

fi->fib_treeref++;
atomic_inc(&fi->fib_clntref);
write_lock(&fib_info_lock);
write_lock_bh(&fib_info_lock);
hlist_add_head(&fi->fib_hash,
&fib_info_hash[fib_info_hashfn(fi)]);
if (fi->fib_prefsrc) {
Expand All @@ -839,7 +839,7 @@ fib_create_info(const struct rtmsg *r, struct kern_rta *rta,
head = &fib_info_devhash[hash];
hlist_add_head(&nh->nh_hash, head);
} endfor_nexthops(fi)
write_unlock(&fib_info_lock);
write_unlock_bh(&fib_info_lock);
return fi;

err_inval:
Expand Down

0 comments on commit a74fec0

Please sign in to comment.