Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

7 files changed, 14 insertions, 16 deletions

diff --git a/net/sched/cls_fw.c b/net/sched/cls_fw.c
index 29d8b9a4d162..75470486e405 100644
--- a/net/sched/cls_fw.c
+++ b/net/sched/cls_fw.c
@@ -298,8 +298,7 @@ static int fw_change(struct tcf_proto *tp, unsigned long base,
         return 0;
 
 errout:
-        if (f)
-                kfree(f);
+        kfree(f);
         return err;
 }
 
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c
index 02996ac05c75..520ff716dab2 100644
--- a/net/sched/cls_route.c
+++ b/net/sched/cls_route.c
@@ -525,8 +525,7 @@ reinsert:
         return 0;
 
 errout:
-        if (f)
-                kfree(f);
+        kfree(f);
         return err;
 }
 
diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index 006168d69376..572f06be3b02 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -555,8 +555,7 @@ insert:
         goto insert;
 
 errout:
-        if (f)
-                kfree(f);
+        kfree(f);
 errout2:
         tcf_exts_destroy(tp, &e);
         return err;
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 404d9d83a7fa..9f921174c8ab 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -194,8 +194,7 @@ found:
         }
         tcf_unbind_filter(tp, &r->res);
         tcf_exts_destroy(tp, &r->exts);
-        if (f)
-                kfree(f);
+        kfree(f);
         return 0;
 }
 
@@ -442,10 +441,8 @@ static void tcindex_destroy(struct tcf_proto *tp)
         walker.skip = 0;
         walker.fn = &tcindex_destroy_element;
         tcindex_walk(tp,&walker);
-        if (p->perfect)
-                kfree(p->perfect);
-        if (p->h)
-                kfree(p->h);
+        kfree(p->perfect);
+        kfree(p->h);
         kfree(p);
         tp->root = NULL;
 }
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c
index 364b87d86455..2b670479dde1 100644
--- a/net/sched/cls_u32.c
+++ b/net/sched/cls_u32.c
@@ -347,7 +347,7 @@ static int u32_destroy_key(struct tcf_proto *tp, struct tc_u_knode *n)
         if (n->ht_down)
                 n->ht_down->refcnt--;
 #ifdef CONFIG_CLS_U32_PERF
-        if (n && (NULL != n->pf))
+        if (n)
                 kfree(n->pf);
 #endif
         kfree(n);
@@ -680,7 +680,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
                 return 0;
         }
 #ifdef CONFIG_CLS_U32_PERF
-        if (n && (NULL != n->pf))
+        if (n)
                 kfree(n->pf);
 #endif
         kfree(n);
diff --git a/net/sched/em_meta.c b/net/sched/em_meta.c
index cf68a59fdc5a..700844d49d79 100644
--- a/net/sched/em_meta.c
+++ b/net/sched/em_meta.c
@@ -561,8 +561,7 @@ static int meta_var_change(struct meta_value *dst, struct rtattr *rta)
 
 static void meta_var_destroy(struct meta_value *v)
 {
-        if (v->val)
-                kfree((void *) v->val);
+        kfree((void *) v->val);
 }
 
 static void meta_var_apply_extras(struct meta_value *v,
diff --git a/net/sched/ematch.c b/net/sched/ematch.c
index ebfe2e7d21bd..64b047c65568 100644
--- a/net/sched/ematch.c
+++ b/net/sched/ematch.c
@@ -298,6 +298,11 @@ int tcf_em_tree_validate(struct tcf_proto *tp, struct rtattr *rta,
         struct tcf_ematch_tree_hdr *tree_hdr;
         struct tcf_ematch *em;
 
+        if (!rta) {
+                memset(tree, 0, sizeof(*tree));
+                return 0;
+        }
+
         if (rtattr_parse_nested(tb, TCA_EMATCH_TREE_MAX, rta) < 0)
                 goto errout;