From: Jonathan Lemon <b...@fb.com>

Rename the get routines for consistency.

Signed-off-by: Jonathan Lemon <jonathan.le...@gmail.com>
---
 include/linux/skbuff.h | 4 ++--
 net/core/skbuff.c      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index df98d61e8c51..638feaf98f17 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -494,7 +494,7 @@ 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)
+static inline void skb_zcopy_get(struct ubuf_info *uarg)
 {
        refcount_inc(&uarg->refcnt);
 }
@@ -1451,7 +1451,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)->zc_flags |= SKBZC_FRAGMENTS;
        }
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 984760dd670b..fbf0a145467a 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -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;
                }
-- 
2.24.1

Reply via email to