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

skbuff: replace sock_zerocopy_put() with skb_zcopy_put() 



Replace sock_zerocopy_put with the generic skb_zcopy_put()
function.  Pass 'true' as the success argument, as this
is identical to no change.

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

include/linux/skbuff.h

+6 −1
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ static inline void sock_zerocopy_get(struct ubuf_info *uarg) 
	refcount_inc(&uarg->refcnt);

}



void sock_zerocopy_put(struct ubuf_info *uarg);

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



void sock_zerocopy_callback(struct ubuf_info *uarg, bool success);
@@ -1471,6 +1470,12 @@ static inline void *skb_zcopy_get_nouarg(struct sk_buff *skb) 
	return (void *)((uintptr_t) skb_shinfo(skb)->destructor_arg & ~0x1UL);

}



static inline void skb_zcopy_put(struct ubuf_info *uarg)

{

	if (uarg)

		uarg->callback(uarg, true);

}



/* Release a reference on a zerocopy structure */

static inline void skb_zcopy_clear(struct sk_buff *skb, bool zerocopy)

{

net/core/skbuff.c

+1 −8
Original line number Diff line number Diff line
@@ -1251,13 +1251,6 @@ void sock_zerocopy_callback(struct ubuf_info *uarg, bool success) 
}

EXPORT_SYMBOL_GPL(sock_zerocopy_callback);



void sock_zerocopy_put(struct ubuf_info *uarg)

{

	if (uarg)

		uarg->callback(uarg, uarg->zerocopy);

}

EXPORT_SYMBOL_GPL(sock_zerocopy_put);



void sock_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref)

{

	if (uarg) {
@@ -1267,7 +1260,7 @@ void sock_zerocopy_put_abort(struct ubuf_info *uarg, bool have_uref) 
		uarg->len--;



		if (have_uref)

			sock_zerocopy_put(uarg);

			skb_zcopy_put(uarg);

	}

}

EXPORT_SYMBOL_GPL(sock_zerocopy_put_abort);

net/ipv4/tcp.c

+1 −1
Original line number Diff line number Diff line
@@ -1429,7 +1429,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 
		tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);

	}

out_nopush:

	sock_zerocopy_put(uarg);

	skb_zcopy_put(uarg);

	return copied + copied_syn;



do_error: