Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
4b4fbad3
Commit
4b4fbad3
authored
9 years ago
by
Al Viro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ncpfs: sendmsg does *not* bugger iovec these days
Signed-off-by:
Al Viro
<
viro@zeniv.linux.org.uk
>
parent
b4b8664d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
fs/ncpfs/sock.c
fs/ncpfs/sock.c
+2
-8
No files found.
fs/ncpfs/sock.c
View file @
4b4fbad3
...
...
@@ -205,10 +205,7 @@ static inline void __ncptcp_abort(struct ncp_server *server)
static
int
ncpdgram_send
(
struct
socket
*
sock
,
struct
ncp_request_reply
*
req
)
{
struct
kvec
vec
[
3
];
/* sock_sendmsg updates iov pointers for us :-( */
memcpy
(
vec
,
req
->
tx_ciov
,
req
->
tx_iovlen
*
sizeof
(
vec
[
0
]));
return
do_send
(
sock
,
vec
,
req
->
tx_iovlen
,
return
do_send
(
sock
,
req
->
tx_ciov
,
req
->
tx_iovlen
,
req
->
tx_totallen
,
MSG_DONTWAIT
);
}
...
...
@@ -216,16 +213,13 @@ static void __ncptcp_try_send(struct ncp_server *server)
{
struct
ncp_request_reply
*
rq
;
struct
kvec
*
iov
;
struct
kvec
iovc
[
3
];
int
result
;
rq
=
server
->
tx
.
creq
;
if
(
!
rq
)
return
;
/* sock_sendmsg updates iov pointers for us :-( */
memcpy
(
iovc
,
rq
->
tx_ciov
,
rq
->
tx_iovlen
*
sizeof
(
iov
[
0
]));
result
=
do_send
(
server
->
ncp_sock
,
iovc
,
rq
->
tx_iovlen
,
result
=
do_send
(
server
->
ncp_sock
,
rq
->
tx_ciov
,
rq
->
tx_iovlen
,
rq
->
tx_totallen
,
MSG_NOSIGNAL
|
MSG_DONTWAIT
);
if
(
result
==
-
EAGAIN
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment