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/ipx | |
| 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/ipx')
| -rw-r--r-- | net/ipx/af_ipx.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index f11ad1d95e0e..4ea5d7497b5f 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c | |||
| @@ -1688,8 +1688,7 @@ out: | |||
| 1688 | return rc; | 1688 | return rc; |
| 1689 | } | 1689 | } |
| 1690 | 1690 | ||
| 1691 | static int ipx_sendmsg(struct kiocb *iocb, struct socket *sock, | 1691 | static int ipx_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) |
| 1692 | struct msghdr *msg, size_t len) | ||
| 1693 | { | 1692 | { |
| 1694 | struct sock *sk = sock->sk; | 1693 | struct sock *sk = sock->sk; |
| 1695 | struct ipx_sock *ipxs = ipx_sk(sk); | 1694 | struct ipx_sock *ipxs = ipx_sk(sk); |
| @@ -1754,8 +1753,8 @@ out: | |||
| 1754 | } | 1753 | } |
| 1755 | 1754 | ||
| 1756 | 1755 | ||
| 1757 | static int ipx_recvmsg(struct kiocb *iocb, struct socket *sock, | 1756 | static int ipx_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, |
| 1758 | struct msghdr *msg, size_t size, int flags) | 1757 | int flags) |
| 1759 | { | 1758 | { |
| 1760 | struct sock *sk = sock->sk; | 1759 | struct sock *sk = sock->sk; |
| 1761 | struct ipx_sock *ipxs = ipx_sk(sk); | 1760 | struct ipx_sock *ipxs = ipx_sk(sk); |