[PATCH] fs: fix nobh data leak

[mv-sheeva.git] / net / ipv4 / multipath_random.c

diff --git a/net/ipv4/multipath_random.c b/net/ipv4/multipath_random.c
index b8c289f247cbb2622bbabe2fdfc0a2e028931962..57f481498fbb39d99338187b9a0653efbb692b7a 100644 (file)
--- a/net/ipv4/multipath_random.c
+++ b/net/ipv4/multipath_random.c
@@ -15,7 +15,6 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <linux/types.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/timer.h>
 #include <linux/mm.h>
@@ -74,7 +73,7 @@ static void random_select_route(const struct flowi *flp,
 
        /* count all candidate */
        for (rt = rcu_dereference(first); rt;
-            rt = rcu_dereference(rt->u.rt_next)) {
+            rt = rcu_dereference(rt->u.dst.rt_next)) {
                if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
                    multipath_comparekeys(&rt->fl, flp))
                        ++candidate_count;
@@ -90,7 +89,7 @@ static void random_select_route(const struct flowi *flp,
                /* find chosen candidate and adjust GC data for all candidates
                 * to ensure they stay in cache
                 */
-               for (rt = first; rt; rt = rt->u.rt_next) {
+               for (rt = first; rt; rt = rt->u.dst.rt_next) {
                        if ((rt->u.dst.flags & DST_BALANCED) != 0 &&
                            multipath_comparekeys(&rt->fl, flp)) {
                                rt->u.dst.lastuse = jiffies;