net: Make msg_zerocopy_alloc static

dsahern · kuba-moo · commit c67b627e99af · 2022-05-05T17:02:50.000-07:00
msg_zerocopy_alloc is only used by msg_zerocopy_realloc; remove the export and make static in skbuff.c Signed-off-by: David Ahern <dsahern@kernel.org> Acked-by: Jonathan Lemon <jonathan.lemon@gmail.com> Link: https://lore.kernel.org/r/20220504170947.18773-1-dsahern@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
@@ -1665,7 +1665,6 @@ static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset)
 }
 #endif
 
-struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size);
 struct ubuf_info *msg_zerocopy_realloc(struct sock *sk, size_t size,
 				       struct ubuf_info *uarg);
 
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
@@ -1165,7 +1165,7 @@ void mm_unaccount_pinned_pages(struct mmpin *mmp)
 }
 EXPORT_SYMBOL_GPL(mm_unaccount_pinned_pages);
 
-struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size)
+static struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size)
 {
 	struct ubuf_info *uarg;
 	struct sk_buff *skb;
@@ -1196,7 +1196,6 @@ struct ubuf_info *msg_zerocopy_alloc(struct sock *sk, size_t size)
 
 	return uarg;
 }
-EXPORT_SYMBOL_GPL(msg_zerocopy_alloc);
 
 static inline struct sk_buff *skb_from_uarg(struct ubuf_info *uarg)
 {

Original file line number	Diff line number	Diff line change
`@@ -1665,7 +1665,6 @@ static inline void skb_set_end_offset(struct sk_buff *skb, unsigned int offset)`
`1665`	`1665`	`}`
`1666`	`1666`	`#endif`
`1667`	`1667`
`1668`		`-struct ubuf_info msg_zerocopy_alloc(struct sock sk, size_t size);`
`1669`	`1668`	`struct ubuf_info msg_zerocopy_realloc(struct sock sk, size_t size,`
`1670`	`1669`	`struct ubuf_info *uarg);`
`1671`	`1670`
Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ void mm_unaccount_pinned_pages(struct mmpin *mmp)`
`1165`	`1165`	`}`
`1166`	`1166`	`EXPORT_SYMBOL_GPL(mm_unaccount_pinned_pages);`
`1167`	`1167`
`1168`		`-struct ubuf_info msg_zerocopy_alloc(struct sock sk, size_t size)`
	`1168`	`+static struct ubuf_info msg_zerocopy_alloc(struct sock sk, size_t size)`
`1169`	`1169`	`{`
`1170`	`1170`	`struct ubuf_info *uarg;`
`1171`	`1171`	`struct sk_buff *skb;`
`@@ -1196,7 +1196,6 @@ struct ubuf_info msg_zerocopy_alloc(struct sock sk, size_t size)`
`1196`	`1196`
`1197`	`1197`	`return uarg;`
`1198`	`1198`	`}`
`1199`		`-EXPORT_SYMBOL_GPL(msg_zerocopy_alloc);`
`1200`	`1199`
`1201`	`1200`	`static inline struct sk_buff skb_from_uarg(struct ubuf_info uarg)`
`1202`	`1201`	`{`