Commit 65c84f14 authored by Jonathan Lemon's avatar Jonathan Lemon Committed by David S. Miller
Browse files

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: default avatarJonathan Lemon <jonathan.lemon@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b54c9d5b

include/linux/bvec.h

+1 −4
Original line number Diff line number Diff line
@@ -18,11 +18,8 @@ 
struct bio_vec {

	struct page	*bv_page;

	unsigned int	bv_len;

	union {

		__u32		page_offset;

	unsigned int	bv_offset;

};

};



struct bvec_iter {

	sector_t		bi_sector;	/* device address in 512 byte

include/linux/skbuff.h

+5 −5
Original line number Diff line number Diff line
@@ -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;

}



/**