Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-506 kernel: FC15 - small changes
[fs/lustre-release.git]
/
libcfs
/
libcfs
/
linux
/
linux-tcpip.c
diff --git
a/libcfs/libcfs/linux/linux-tcpip.c
b/libcfs/libcfs/linux/linux-tcpip.c
index
95136c1
..
07f9a36
100644
(file)
--- a/
libcfs/libcfs/linux/linux-tcpip.c
+++ b/
libcfs/libcfs/linux/linux-tcpip.c
@@
-615,7
+615,7
@@
libcfs_sock_accept (struct socket **newsockp, struct socket *sock)
newsock->ops = sock->ops;
set_current_state(TASK_INTERRUPTIBLE);
newsock->ops = sock->ops;
set_current_state(TASK_INTERRUPTIBLE);
- add_wait_queue(s
ock->sk->sk_sleep
, &wait);
+ add_wait_queue(s
k_sleep(sock->sk)
, &wait);
rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
if (rc == -EAGAIN) {
rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
if (rc == -EAGAIN) {
@@
-624,7
+624,7
@@
libcfs_sock_accept (struct socket **newsockp, struct socket *sock)
rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
}
rc = sock->ops->accept(sock, newsock, O_NONBLOCK);
}
- remove_wait_queue(s
ock->sk->sk_sleep
, &wait);
+ remove_wait_queue(s
k_sleep(sock->sk)
, &wait);
set_current_state(TASK_RUNNING);
if (rc != 0)
set_current_state(TASK_RUNNING);
if (rc != 0)
@@
-643,7
+643,7
@@
EXPORT_SYMBOL(libcfs_sock_accept);
void
libcfs_sock_abort_accept (struct socket *sock)
{
void
libcfs_sock_abort_accept (struct socket *sock)
{
- wake_up_all(s
ock->sk->sk_sleep
);
+ wake_up_all(s
k_sleep(sock->sk)
);
}
EXPORT_SYMBOL(libcfs_sock_abort_accept);
}
EXPORT_SYMBOL(libcfs_sock_abort_accept);