forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Browse source 
Conflicts:
	drivers/firmware/iscsi_ibft.c
This commit is contained in:
David S. Miller 2010-02-28 19:23:06 -08:00
commit 47871889c6
2090 changed files with 104065 additions and 45054 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/core/sock.c
View file

@ -1073,7 +1073,8 @@ static void __sk_free(struct sock *sk)
if (sk->sk_destruct)
sk->sk_destruct(sk);
filter = rcu_dereference(sk->sk_filter);
filter = rcu_dereference_check(sk->sk_filter,
atomic_read(&sk->sk_wmem_alloc) == 0);
if (filter) {
sk_filter_uncharge(sk, filter);
rcu_assign_pointer(sk->sk_filter, NULL);