diff options
author | Ying Xue <ying.xue@windriver.com> | 2015-03-02 02:37:48 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-02 13:06:31 -0500 |
commit | 1b784140474e4fc94281a49e96c67d29df0efbde (patch) | |
tree | 569e9813ae7ab79616849b117c6b50b3d6e4dabb /net/caif | |
parent | 39a0295f901423e260a034ac7c3211ecaa9c2745 (diff) |
net: Remove iocb argument from sendmsg and recvmsg
After TIPC doesn't depend on iocb argument in its internal
implementations of sendmsg() and recvmsg() hooks defined in proto
structure, no any user is using iocb argument in them at all now.
Then we can drop the redundant iocb argument completely from kinds of
implementations of both sendmsg() and recvmsg() in the entire
networking stack.
Cc: Christoph Hellwig <hch@lst.de>
Suggested-by: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/caif')
-rw-r--r-- | net/caif/caif_socket.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 769b185fefbd..b6bf51bb187d 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c | |||
@@ -271,8 +271,8 @@ static void caif_check_flow_release(struct sock *sk) | |||
271 | * Copied from unix_dgram_recvmsg, but removed credit checks, | 271 | * Copied from unix_dgram_recvmsg, but removed credit checks, |
272 | * changed locking, address handling and added MSG_TRUNC. | 272 | * changed locking, address handling and added MSG_TRUNC. |
273 | */ | 273 | */ |
274 | static int caif_seqpkt_recvmsg(struct kiocb *iocb, struct socket *sock, | 274 | static int caif_seqpkt_recvmsg(struct socket *sock, struct msghdr *m, |
275 | struct msghdr *m, size_t len, int flags) | 275 | size_t len, int flags) |
276 | 276 | ||
277 | { | 277 | { |
278 | struct sock *sk = sock->sk; | 278 | struct sock *sk = sock->sk; |
@@ -343,9 +343,8 @@ static long caif_stream_data_wait(struct sock *sk, long timeo) | |||
343 | * Copied from unix_stream_recvmsg, but removed credit checks, | 343 | * Copied from unix_stream_recvmsg, but removed credit checks, |
344 | * changed locking calls, changed address handling. | 344 | * changed locking calls, changed address handling. |
345 | */ | 345 | */ |
346 | static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock, | 346 | static int caif_stream_recvmsg(struct socket *sock, struct msghdr *msg, |
347 | struct msghdr *msg, size_t size, | 347 | size_t size, int flags) |
348 | int flags) | ||
349 | { | 348 | { |
350 | struct sock *sk = sock->sk; | 349 | struct sock *sk = sock->sk; |
351 | int copied = 0; | 350 | int copied = 0; |
@@ -511,8 +510,8 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk, | |||
511 | } | 510 | } |
512 | 511 | ||
513 | /* Copied from af_unix:unix_dgram_sendmsg, and adapted to CAIF */ | 512 | /* Copied from af_unix:unix_dgram_sendmsg, and adapted to CAIF */ |
514 | static int caif_seqpkt_sendmsg(struct kiocb *kiocb, struct socket *sock, | 513 | static int caif_seqpkt_sendmsg(struct socket *sock, struct msghdr *msg, |
515 | struct msghdr *msg, size_t len) | 514 | size_t len) |
516 | { | 515 | { |
517 | struct sock *sk = sock->sk; | 516 | struct sock *sk = sock->sk; |
518 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); | 517 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); |
@@ -586,8 +585,8 @@ err: | |||
586 | * Changed removed permission handling and added waiting for flow on | 585 | * Changed removed permission handling and added waiting for flow on |
587 | * and other minor adaptations. | 586 | * and other minor adaptations. |
588 | */ | 587 | */ |
589 | static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | 588 | static int caif_stream_sendmsg(struct socket *sock, struct msghdr *msg, |
590 | struct msghdr *msg, size_t len) | 589 | size_t len) |
591 | { | 590 | { |
592 | struct sock *sk = sock->sk; | 591 | struct sock *sk = sock->sk; |
593 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); | 592 | struct caifsock *cf_sk = container_of(sk, struct caifsock, sk); |