diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 16:56:39 -0400 |
commit | d3ec4844d449cf7af9e749f73ba2052fb7b72fc2 (patch) | |
tree | c515913e85f7e50878c83da2a88bc5a7269d087c /include/net | |
parent | 0003230e8200699860f0b10af524dc47bf8aecad (diff) | |
parent | df2e301fee3c2c2a87592151397ad7699bb14c37 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
fs: Merge split strings
treewide: fix potentially dangerous trailing ';' in #defined values/expressions
uwb: Fix misspelling of neighbourhood in comment
net, netfilter: Remove redundant goto in ebt_ulog_packet
trivial: don't touch files that are removed in the staging tree
lib/vsprintf: replace link to Draft by final RFC number
doc: Kconfig: `to be' -> `be'
doc: Kconfig: Typo: square -> squared
doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
drivers/net: static should be at beginning of declaration
drivers/media: static should be at beginning of declaration
drivers/i2c: static should be at beginning of declaration
XTENSA: static should be at beginning of declaration
SH: static should be at beginning of declaration
MIPS: static should be at beginning of declaration
ARM: static should be at beginning of declaration
rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
Update my e-mail address
PCIe ASPM: forcedly -> forcibly
gma500: push through device driver tree
...
Fix up trivial conflicts:
- arch/arm/mach-ep93xx/dma-m2p.c (deleted)
- drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
- drivers/net/r8169.c (just context changes)
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/sock.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 396f735e0cd5..8e4062f165b8 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -1303,8 +1303,7 @@ extern unsigned long sock_i_ino(struct sock *sk); | |||
1303 | static inline struct dst_entry * | 1303 | static inline struct dst_entry * |
1304 | __sk_dst_get(struct sock *sk) | 1304 | __sk_dst_get(struct sock *sk) |
1305 | { | 1305 | { |
1306 | return rcu_dereference_check(sk->sk_dst_cache, rcu_read_lock_held() || | 1306 | return rcu_dereference_check(sk->sk_dst_cache, sock_owned_by_user(sk) || |
1307 | sock_owned_by_user(sk) || | ||
1308 | lockdep_is_held(&sk->sk_lock.slock)); | 1307 | lockdep_is_held(&sk->sk_lock.slock)); |
1309 | } | 1308 | } |
1310 | 1309 | ||