remove garbage the sneaked into the ext3 fix

Spotted by Thomas Voegtle.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 9a0e9e789339f6e1cd58d99d857844898e0aab85..7e631a542577deac5830f72f223ff45825b08931 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -997,21 +997,6 @@ static inline int pskb_trim(struct sk_buff *skb, unsigned int len)
        return (len < skb->len) ? __pskb_trim(skb, len) : 0;
 }
 
-/**
- *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer
- *     @skb: buffer to alter
- *     @len: new length
- *
- *     This is identical to pskb_trim except that the caller knows that
- *     the skb is not cloned so we should never get an error due to out-
- *     of-memory.
- */
-static inline void pskb_trim_unique(struct sk_buff *skb, unsigned int len)
-{
-       int err = pskb_trim(skb, len);
-       BUG_ON(err);
-}
-
 /**
  *     skb_orphan - orphan a buffer
  *     @skb: buffer to orphan

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index b24c6a0c5574c7c229975251367121c60f17a446..8dcba3887f04eb647df01ae404b3b9bda955408d 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -946,7 +946,7 @@ alloc_new_skb:
                                skb_prev->csum = csum_sub(skb_prev->csum,
                                                          skb->csum);
                                data += fraggap;
-                               pskb_trim_unique(skb_prev, maxfraglen);
+                               skb_trim(skb_prev, maxfraglen);
                        }
 
                        copy = datalen - transhdrlen - fraggap;
@@ -1139,7 +1139,7 @@ ssize_t   ip_append_page(struct sock *sk, struct page *page,
                                        data, fraggap, 0);
                                skb_prev->csum = csum_sub(skb_prev->csum,
                                                          skb->csum);
-                               pskb_trim_unique(skb_prev, maxfraglen);
+                               skb_trim(skb_prev, maxfraglen);
                        }
 
                        /*

diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 1b528aa132007dc1b16e475dfe7eb4311ae76599..5bf70b1442eae1f0be6497774be8ea7ceac9cbf1 100644 (file)
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -1046,7 +1046,7 @@ alloc_new_skb:
                                skb_prev->csum = csum_sub(skb_prev->csum,
                                                          skb->csum);
                                data += fraggap;
-                               pskb_trim_unique(skb_prev, maxfraglen);
+                               skb_trim(skb_prev, maxfraglen);
                        }
                        copy = datalen - transhdrlen - fraggap;
                        if (copy < 0) {