mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
SUNRPC: Rename skb_reader_t and friends
Clean-up: hch suggested that the RPC client shouldn't pollute the name space used by the generic skb manipulation routines in net/core/skbuff.c. Rename a couple of types in xdr.h to adhere to this convention. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
9d29231690
commit
dd4564715e
3 changed files with 15 additions and 15 deletions
|
@ -148,19 +148,19 @@ extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsign
|
|||
/*
|
||||
* Helper structure for copying from an sk_buff.
|
||||
*/
|
||||
typedef struct {
|
||||
struct xdr_skb_reader {
|
||||
struct sk_buff *skb;
|
||||
unsigned int offset;
|
||||
size_t count;
|
||||
__wsum csum;
|
||||
} skb_reader_t;
|
||||
};
|
||||
|
||||
typedef size_t (*skb_read_actor_t)(skb_reader_t *desc, void *to, size_t len);
|
||||
typedef size_t (*xdr_skb_read_actor)(struct xdr_skb_reader *desc, void *to, size_t len);
|
||||
|
||||
size_t xdr_skb_read_bits(skb_reader_t *desc, void *to, size_t len);
|
||||
size_t xdr_skb_read_bits(struct xdr_skb_reader *desc, void *to, size_t len);
|
||||
extern int csum_partial_copy_to_xdr(struct xdr_buf *, struct sk_buff *);
|
||||
extern ssize_t xdr_partial_copy_from_skb(struct xdr_buf *, unsigned int,
|
||||
skb_reader_t *, skb_read_actor_t);
|
||||
struct xdr_skb_reader *, xdr_skb_read_actor);
|
||||
|
||||
extern int xdr_encode_word(struct xdr_buf *, unsigned int, u32);
|
||||
extern int xdr_decode_word(struct xdr_buf *, unsigned int, u32 *);
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
* Possibly called several times to iterate over an sk_buff and copy
|
||||
* data out of it.
|
||||
*/
|
||||
size_t xdr_skb_read_bits(skb_reader_t *desc, void *to, size_t len)
|
||||
size_t xdr_skb_read_bits(struct xdr_skb_reader *desc, void *to, size_t len)
|
||||
{
|
||||
if (len > desc->count)
|
||||
len = desc->count;
|
||||
|
@ -43,7 +43,7 @@ size_t xdr_skb_read_bits(skb_reader_t *desc, void *to, size_t len)
|
|||
*
|
||||
* Same as skb_read_bits, but calculate a checksum at the same time.
|
||||
*/
|
||||
static size_t xdr_skb_read_and_csum_bits(skb_reader_t *desc, void *to, size_t len)
|
||||
static size_t xdr_skb_read_and_csum_bits(struct xdr_skb_reader *desc, void *to, size_t len)
|
||||
{
|
||||
unsigned int pos;
|
||||
__wsum csum2;
|
||||
|
@ -66,7 +66,7 @@ static size_t xdr_skb_read_and_csum_bits(skb_reader_t *desc, void *to, size_t le
|
|||
* @copy_actor: virtual method for copying data
|
||||
*
|
||||
*/
|
||||
ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, skb_reader_t *desc, skb_read_actor_t copy_actor)
|
||||
ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, struct xdr_skb_reader *desc, xdr_skb_read_actor copy_actor)
|
||||
{
|
||||
struct page **ppage = xdr->pages;
|
||||
unsigned int len, pglen = xdr->page_len;
|
||||
|
@ -148,7 +148,7 @@ ssize_t xdr_partial_copy_from_skb(struct xdr_buf *xdr, unsigned int base, skb_re
|
|||
*/
|
||||
int csum_partial_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
|
||||
{
|
||||
skb_reader_t desc;
|
||||
struct xdr_skb_reader desc;
|
||||
|
||||
desc.skb = skb;
|
||||
desc.offset = sizeof(struct udphdr);
|
||||
|
|
|
@ -651,7 +651,7 @@ static void xs_udp_data_ready(struct sock *sk, int len)
|
|||
read_unlock(&sk->sk_callback_lock);
|
||||
}
|
||||
|
||||
static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, skb_reader_t *desc)
|
||||
static inline void xs_tcp_read_fraghdr(struct rpc_xprt *xprt, struct xdr_skb_reader *desc)
|
||||
{
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
size_t len, used;
|
||||
|
@ -697,7 +697,7 @@ static void xs_tcp_check_fraghdr(struct sock_xprt *transport)
|
|||
}
|
||||
}
|
||||
|
||||
static inline void xs_tcp_read_xid(struct sock_xprt *transport, skb_reader_t *desc)
|
||||
static inline void xs_tcp_read_xid(struct sock_xprt *transport, struct xdr_skb_reader *desc)
|
||||
{
|
||||
size_t len, used;
|
||||
char *p;
|
||||
|
@ -717,7 +717,7 @@ static inline void xs_tcp_read_xid(struct sock_xprt *transport, skb_reader_t *de
|
|||
xs_tcp_check_fraghdr(transport);
|
||||
}
|
||||
|
||||
static inline void xs_tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc)
|
||||
static inline void xs_tcp_read_request(struct rpc_xprt *xprt, struct xdr_skb_reader *desc)
|
||||
{
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
struct rpc_rqst *req;
|
||||
|
@ -739,7 +739,7 @@ static inline void xs_tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc
|
|||
rcvbuf = &req->rq_private_buf;
|
||||
len = desc->count;
|
||||
if (len > transport->tcp_reclen - transport->tcp_offset) {
|
||||
skb_reader_t my_desc;
|
||||
struct xdr_skb_reader my_desc;
|
||||
|
||||
len = transport->tcp_reclen - transport->tcp_offset;
|
||||
memcpy(&my_desc, desc, sizeof(my_desc));
|
||||
|
@ -795,7 +795,7 @@ static inline void xs_tcp_read_request(struct rpc_xprt *xprt, skb_reader_t *desc
|
|||
xs_tcp_check_fraghdr(transport);
|
||||
}
|
||||
|
||||
static inline void xs_tcp_read_discard(struct sock_xprt *transport, skb_reader_t *desc)
|
||||
static inline void xs_tcp_read_discard(struct sock_xprt *transport, struct xdr_skb_reader *desc)
|
||||
{
|
||||
size_t len;
|
||||
|
||||
|
@ -813,7 +813,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
|
|||
{
|
||||
struct rpc_xprt *xprt = rd_desc->arg.data;
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
skb_reader_t desc = {
|
||||
struct xdr_skb_reader desc = {
|
||||
.skb = skb,
|
||||
.offset = offset,
|
||||
.count = len,
|
||||
|
|
Loading…
Reference in a new issue