redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ocfs2: don't open-code kernel_sendmsg()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2014-02-08 13:27:03 -05:00
parent 4f18cd317a
commit 66f5dcef13
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
fs/ocfs2/cluster/tcp.c
View file

@ -940,33 +940,21 @@ static int o2net_send_tcp_msg(struct socket *sock, struct kvec *vec,
size_t veclen, size_t total) size_t veclen, size_t total)
{ {
int ret; int ret;
mm_segment_t oldfs; struct msghdr msg;
struct msghdr msg = {
.msg_iov = (struct iovec *)vec,
.msg_iovlen = veclen,
};
if (sock == NULL) { if (sock == NULL) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
oldfs = get_fs(); ret = kernel_sendmsg(sock, &msg, vec, veclen, total);
set_fs(get_ds()); if (likely(ret == total))
ret = sock_sendmsg(sock, &msg, total); return 0;
set_fs(oldfs); mlog(ML_ERROR, "sendmsg returned %d instead of %zu\n", ret, total);
if (ret != total) { if (ret >= 0)
mlog(ML_ERROR, "sendmsg returned %d instead of %zu\n", ret, ret = -EPIPE; /* should be smarter, I bet */
total);
if (ret >= 0)
ret = -EPIPE; /* should be smarter, I bet */
goto out;
}
ret = 0;
out: out:
if (ret < 0) mlog(0, "returning error: %d\n", ret);
mlog(0, "returning error: %d\n", ret);
return ret; return ret;
} }