UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

linux: Remove bvec page_offset, use bv_offset 

Now that page_offset is referenced through accessors, remove
the union, and use bv_offset.

Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jonathan Lemon 2019-07-30 07:40:34 -07:00 committed by David S. Miller
parent b54c9d5bd6
commit 65c84f148e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/linux/bvec.h
View File

@ -18,10 +18,7 @@
struct bio_vec {
struct page *bv_page;
unsigned int bv_len;
union {
__u32 page_offset;
unsigned int bv_offset;
};
unsigned int bv_offset;
};
struct bvec_iter {

10
include/linux/skbuff.h
View File

@ -2078,7 +2078,7 @@ static inline void __skb_fill_page_desc(struct sk_buff *skb, int i,
* on page_is_pfmemalloc doing the right thing(tm).
*/
frag->bv_page = page;
frag->page_offset = off;
frag->bv_offset = off;
skb_frag_size_set(frag, size);
page = compound_head(page);
@ -2863,7 +2863,7 @@ static inline void skb_propagate_pfmemalloc(struct page *page,
*/
static inline unsigned int skb_frag_off(const skb_frag_t *frag)
{
return frag->page_offset;
return frag->bv_offset;
}
/**
@ -2873,7 +2873,7 @@ static inline unsigned int skb_frag_off(const skb_frag_t *frag)
*/
static inline void skb_frag_off_add(skb_frag_t *frag, int delta)
{
frag->page_offset += delta;
frag->bv_offset += delta;
}
/**
@ -2883,7 +2883,7 @@ static inline void skb_frag_off_add(skb_frag_t *frag, int delta)
*/
static inline void skb_frag_off_set(skb_frag_t *frag, unsigned int offset)
{
frag->page_offset = offset;
frag->bv_offset = offset;
}
/**
@ -2894,7 +2894,7 @@ static inline void skb_frag_off_set(skb_frag_t *frag, unsigned int offset)
static inline void skb_frag_off_copy(skb_frag_t *fragto,
const skb_frag_t *fragfrom)
{
fragto->page_offset = fragfrom->page_offset;
fragto->bv_offset = fragfrom->bv_offset;
}
/**