net: Rename skb_frag page to bv_page

One step closer to turning the skb_frag_t into a bio_vec.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b9dc8b4f24b14f1b4f23b9826d3aa299c24ef488..8076e2ba83495e656e7496ec6a2ade46f86cbc03 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -311,9 +311,7 @@ extern int sysctl_max_skb_frags;
 typedef struct skb_frag_struct skb_frag_t;
 
 struct skb_frag_struct {
-       struct {
-               struct page *p;
-       } page;
+       struct page *bv_page;
        __u32 size;
        __u32 page_offset;
 };
@@ -374,7 +372,7 @@ static inline bool skb_frag_must_loop(struct page *p)
  *     skb_frag_foreach_page - loop over pages in a fragment
  *
  *     @f:             skb frag to operate on
- *     @f_off:         offset from start of f->page.p
+ *     @f_off:         offset from start of f->bv_page
  *     @f_len:         length from f_off to loop over
  *     @p:             (temp var) current page
  *     @p_off:         (temp var) offset from start of current page,
@@ -2084,7 +2082,7 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
         * that not all callers have unique ownership of the page but rely
         * on page_is_pfmemalloc doing the right thing(tm).
         */
-       frag->page.p              = page;
+       frag->bv_page             = page;
        frag->page_offset         = off;
        skb_frag_size_set(frag, size);
 
@@ -2872,7 +2870,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page,
  */
 static inline struct page *skb_frag_page(const skb_frag_t *frag)
 {
-       return frag->page.p;
+       return frag->bv_page;
 }
 
 /**
@@ -2958,7 +2956,7 @@ static inline void *skb_frag_address_safe(const skb_frag_t *frag)
  */
 static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
 {
-       frag->page.p = page;
+       frag->bv_page = page;
 }
 
 /**

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index ba9a3690350341d4757850e9434d523ac75066f1..0b788df5a75b8abe33dfe425be9a20cb8ad04c11 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3364,7 +3364,7 @@ int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen)
 
                } else {
                        __skb_frag_ref(fragfrom);
-                       fragto->page = fragfrom->page;
+                       fragto->bv_page = fragfrom->bv_page;
                        fragto->page_offset = fragfrom->page_offset;
                        skb_frag_size_set(fragto, todo);