Message ID | 20120621160902.GA6045@breakpoint.cc |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Jun 21, 2012 at 06:09:02PM +0200, Sebastian Andrzej Siewior wrote: > > <SNIP> > > > If merge this chunk > > diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h > index 6510a5d..2acfec9 100644 > --- a/include/linux/skbuff.h > +++ b/include/linux/skbuff.h > @@ -510,7 +510,7 @@ struct sk_buff { > #define SKB_ALLOC_RX 0x02 > > /* Returns true if the skb was allocated from PFMEMALLOC reserves */ > -static inline bool skb_pfmemalloc(struct sk_buff *skb) > +static inline bool skb_pfmemalloc(const struct sk_buff *skb) > { > return unlikely(skb->pfmemalloc); > } > diff --git a/net/core/skbuff.c b/net/core/skbuff.c > index c44ab68..6ce94b5 100644 > --- a/net/core/skbuff.c > +++ b/net/core/skbuff.c > @@ -852,7 +852,7 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) > > static inline int skb_alloc_rx_flag(const struct sk_buff *skb) > { > - if (skb_pfmemalloc((struct sk_buff *)skb)) > + if (skb_pfmemalloc(skb)) > return SKB_ALLOC_RX; > return 0; > } > > > Then you should be able to drop the case in skb_alloc_rx_flag() without adding > a warning. > You're right. Thanks.
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 6510a5d..2acfec9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -510,7 +510,7 @@ struct sk_buff { #define SKB_ALLOC_RX 0x02 /* Returns true if the skb was allocated from PFMEMALLOC reserves */ -static inline bool skb_pfmemalloc(struct sk_buff *skb) +static inline bool skb_pfmemalloc(const struct sk_buff *skb) { return unlikely(skb->pfmemalloc); } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c44ab68..6ce94b5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -852,7 +852,7 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) static inline int skb_alloc_rx_flag(const struct sk_buff *skb) { - if (skb_pfmemalloc((struct sk_buff *)skb)) + if (skb_pfmemalloc(skb)) return SKB_ALLOC_RX; return 0; }