git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
rxrpc
/
transport.c
diff --git
a/net/rxrpc/transport.c
b/net/rxrpc/transport.c
index
4454c59
..
5770015
100644
(file)
--- a/
net/rxrpc/transport.c
+++ b/
net/rxrpc/transport.c
@@
-611,8
+611,7
@@
int rxrpc_trans_immediate_abort(struct rxrpc_transport *trans,
struct rxrpc_header ahdr;
struct sockaddr_in sin;
struct msghdr msghdr;
struct rxrpc_header ahdr;
struct sockaddr_in sin;
struct msghdr msghdr;
- struct iovec iov[2];
- mm_segment_t oldfs;
+ struct kvec iov[2];
uint32_t _error;
int len, ret;
uint32_t _error;
int len, ret;
@@
-649,8
+648,6
@@
int rxrpc_trans_immediate_abort(struct rxrpc_transport *trans,
msghdr.msg_name = &sin;
msghdr.msg_namelen = sizeof(sin);
msghdr.msg_name = &sin;
msghdr.msg_namelen = sizeof(sin);
- msghdr.msg_iov = iov;
- msghdr.msg_iovlen = 2;
msghdr.msg_control = NULL;
msghdr.msg_controllen = 0;
msghdr.msg_flags = MSG_DONTWAIT;
msghdr.msg_control = NULL;
msghdr.msg_controllen = 0;
msghdr.msg_flags = MSG_DONTWAIT;
@@
-662,10
+659,7
@@
int rxrpc_trans_immediate_abort(struct rxrpc_transport *trans,
htons(sin.sin_port));
/* send the message */
htons(sin.sin_port));
/* send the message */
- oldfs = get_fs();
- set_fs(KERNEL_DS);
- ret = sock_sendmsg(trans->socket, &msghdr, len);
- set_fs(oldfs);
+ ret = kernel_sendmsg(trans->socket, &msghdr, iov, 2, len);
_leave(" = %d", ret);
return ret;
_leave(" = %d", ret);
return ret;
@@
-684,7
+678,6
@@
static void rxrpc_trans_receive_error_report(struct rxrpc_transport *trans)
struct list_head connq, *_p;
struct errormsg emsg;
struct msghdr msg;
struct list_head connq, *_p;
struct errormsg emsg;
struct msghdr msg;
- mm_segment_t oldfs;
uint16_t port;
int local, err;
uint16_t port;
int local, err;
@@
-696,17
+689,12
@@
static void rxrpc_trans_receive_error_report(struct rxrpc_transport *trans)
/* try and receive an error message */
msg.msg_name = &sin;
msg.msg_namelen = sizeof(sin);
/* try and receive an error message */
msg.msg_name = &sin;
msg.msg_namelen = sizeof(sin);
- msg.msg_iov = NULL;
- msg.msg_iovlen = 0;
msg.msg_control = &emsg;
msg.msg_controllen = sizeof(emsg);
msg.msg_flags = 0;
msg.msg_control = &emsg;
msg.msg_controllen = sizeof(emsg);
msg.msg_flags = 0;
- oldfs = get_fs();
- set_fs(KERNEL_DS);
- err = sock_recvmsg(trans->socket, &msg, 0,
+ err = kernel_recvmsg(trans->socket, &msg, NULL, 0, 0,
MSG_ERRQUEUE | MSG_DONTWAIT | MSG_TRUNC);
MSG_ERRQUEUE | MSG_DONTWAIT | MSG_TRUNC);
- set_fs(oldfs);
if (err == -EAGAIN) {
_leave("");
if (err == -EAGAIN) {
_leave("");