Commit e76d46cf authored by Jonathan Lemon's avatar Jonathan Lemon Committed by Jakub Kicinski
Browse files

skbuff: replace sock_zerocopy_get with skb_zcopy_get 



Rename the get routines for consistency.

Signed-off-by: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 59776362

include/linux/skbuff.h

+6 −6
Original line number Diff line number Diff line
@@ -491,11 +491,6 @@ struct ubuf_info *sock_zerocopy_alloc(struct sock *sk, size_t size); 
struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size,

					struct ubuf_info *uarg);



static inline void sock_zerocopy_get(struct ubuf_info *uarg)

{

	refcount_inc(&uarg->refcnt);

}



void sock_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref);



void sock_zerocopy_callback(struct ubuf_info *uarg, bool success);
@@ -1441,6 +1436,11 @@ static inline struct ubuf_info *skb_zcopy(struct sk_buff *skb) 
	return is_zcopy ? skb_uarg(skb) : NULL;

}



static inline void skb_zcopy_get(struct ubuf_info *uarg)

{

	refcount_inc(&uarg->refcnt);

}



static inline void skb_zcopy_set(struct sk_buff *skb, struct ubuf_info *uarg,

				 bool *have_ref)

{
@@ -1448,7 +1448,7 @@ static inline void skb_zcopy_set(struct sk_buff *skb, struct ubuf_info *uarg, 
		if (unlikely(have_ref && *have_ref))

			*have_ref = false;

		else

			sock_zerocopy_get(uarg);

			skb_zcopy_get(uarg);

		skb_shinfo(skb)->destructor_arg = uarg;

		skb_shinfo(skb)->tx_flags |= SKBTX_ZEROCOPY_FRAG;

	}

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ struct ubuf_info *sock_zerocopy_realloc(struct sock *sk, size_t size, 


			/* no extra ref when appending to datagram (MSG_MORE) */

			if (sk->sk_type == SOCK_STREAM)

				sock_zerocopy_get(uarg);

				skb_zcopy_get(uarg);



			return uarg;

		}