Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] dlm: use kern_recvmsg()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-02-09 16:38:45 +00:00 committed by Linus Torvalds
parent 9340b0d356
commit 58addbffdd
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
fs/dlm/lowcomms-tcp.c
View file

@ -268,12 +268,12 @@ static void close_connection(struct connection *con, bool and_other)
static int receive_from_sock(struct connection *con) static int receive_from_sock(struct connection *con)
{ {
int ret = 0; int ret = 0;
struct msghdr msg; struct msghdr msg = {};
struct iovec iov[2]; struct kvec iov[2];
mm_segment_t fs;
unsigned len; unsigned len;
int r; int r;
int call_again_soon = 0; int call_again_soon = 0;
int nvec;
mutex_lock(&con->sock_mutex); mutex_lock(&con->sock_mutex);
@ -293,21 +293,13 @@ static int receive_from_sock(struct connection *con)
cbuf_init(&con->cb, PAGE_CACHE_SIZE); cbuf_init(&con->cb, PAGE_CACHE_SIZE);
} }
msg.msg_control = NULL;
msg.msg_controllen = 0;
msg.msg_iovlen = 1;
msg.msg_iov = iov;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_flags = 0;
/* /*
* iov[0] is the bit of the circular buffer between the current end * iov[0] is the bit of the circular buffer between the current end
* point (cb.base + cb.len) and the end of the buffer. * point (cb.base + cb.len) and the end of the buffer.
*/ */
iov[0].iov_len = con->cb.base - cbuf_data(&con->cb); iov[0].iov_len = con->cb.base - cbuf_data(&con->cb);
iov[0].iov_base = page_address(con->rx_page) + cbuf_data(&con->cb); iov[0].iov_base = page_address(con->rx_page) + cbuf_data(&con->cb);
iov[1].iov_len = 0; nvec = 1;
/* /*
* iov[1] is the bit of the circular buffer between the start of the * iov[1] is the bit of the circular buffer between the start of the
@ -317,15 +309,12 @@ static int receive_from_sock(struct connection *con)
iov[0].iov_len = PAGE_CACHE_SIZE - cbuf_data(&con->cb); iov[0].iov_len = PAGE_CACHE_SIZE - cbuf_data(&con->cb);
iov[1].iov_len = con->cb.base; iov[1].iov_len = con->cb.base;
iov[1].iov_base = page_address(con->rx_page); iov[1].iov_base = page_address(con->rx_page);
msg.msg_iovlen = 2; nvec = 2;
} }
len = iov[0].iov_len + iov[1].iov_len; len = iov[0].iov_len + iov[1].iov_len;
fs = get_fs(); r = ret = kernel_recvmsg(con->sock, &msg, iov, nvec, len,
set_fs(get_ds());
r = ret = sock_recvmsg(con->sock, &msg, len,
MSG_DONTWAIT | MSG_NOSIGNAL); MSG_DONTWAIT | MSG_NOSIGNAL);
set_fs(fs);
if (ret <= 0) if (ret <= 0)
goto out_close; goto out_close;