projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.36-rc7' into core/rcu
[linux-2.6-block.git]
/
net
/
core
/
sock.c
diff --git
a/net/core/sock.c
b/net/core/sock.c
index b05b9b6ddb8700989e63e8597f6946ffd205bdba..ef30e9d286e703cccaffbd5ee10394cc167fe057 100644
(file)
--- a/
net/core/sock.c
+++ b/
net/core/sock.c
@@
-1351,9
+1351,9
@@
int sock_i_uid(struct sock *sk)
{
int uid;
{
int uid;
- read_lock(&sk->sk_callback_lock);
+ read_lock
_bh
(&sk->sk_callback_lock);
uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : 0;
uid = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_uid : 0;
- read_unlock(&sk->sk_callback_lock);
+ read_unlock
_bh
(&sk->sk_callback_lock);
return uid;
}
EXPORT_SYMBOL(sock_i_uid);
return uid;
}
EXPORT_SYMBOL(sock_i_uid);
@@
-1362,9
+1362,9
@@
unsigned long sock_i_ino(struct sock *sk)
{
unsigned long ino;
{
unsigned long ino;
- read_lock(&sk->sk_callback_lock);
+ read_lock
_bh
(&sk->sk_callback_lock);
ino = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_ino : 0;
ino = sk->sk_socket ? SOCK_INODE(sk->sk_socket)->i_ino : 0;
- read_unlock(&sk->sk_callback_lock);
+ read_unlock
_bh
(&sk->sk_callback_lock);
return ino;
}
EXPORT_SYMBOL(sock_i_ino);
return ino;
}
EXPORT_SYMBOL(sock_i_ino);