From 50d6e2d16a2d36e3d1eeeb053a2b111960fd7cd9 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Wed, 21 Dec 2011 20:00:32 +0000
Subject: [PATCH] --- yaml --- r: 276987 b: refs/heads/master c:
 a13861a28b90541aa207532d237e7a940f1b1c7b h: refs/heads/master i:   276985:
 95f6dbcb1af484da8ef30ab91213214e88379641   276983:
 53f916e056f82a34c4d45cfe47ddfcce8b0bf5a9 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/md/bitmap.c       |  5 ++++-
 trunk/drivers/md/linear.c       |  1 -
 trunk/drivers/md/md.c           |  3 ++-
 trunk/drivers/md/raid5.c        | 14 ++++----------
 trunk/net/bridge/br_netfilter.c |  6 ++++++
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2e3da21ae2ee..c03655109738 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad1fca2003822ff2f24c88ad68a29970c5e0d0a7
+refs/heads/master: a13861a28b90541aa207532d237e7a940f1b1c7b
diff --git a/trunk/drivers/md/bitmap.c b/trunk/drivers/md/bitmap.c
index 6d03774b176e..b6907118283a 100644
--- a/trunk/drivers/md/bitmap.c
+++ b/trunk/drivers/md/bitmap.c
@@ -1393,6 +1393,9 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
 			 atomic_read(&bitmap->behind_writes),
 			 bitmap->mddev->bitmap_info.max_write_behind);
 	}
+	if (bitmap->mddev->degraded)
+		/* Never clear bits or update events_cleared when degraded */
+		success = 0;
 
 	while (sectors) {
 		sector_t blocks;
@@ -1406,7 +1409,7 @@ void bitmap_endwrite(struct bitmap *bitmap, sector_t offset, unsigned long secto
 			return;
 		}
 
-		if (success && !bitmap->mddev->degraded &&
+		if (success &&
 		    bitmap->events_cleared < bitmap->mddev->events) {
 			bitmap->events_cleared = bitmap->mddev->events;
 			bitmap->need_sync = 1;
diff --git a/trunk/drivers/md/linear.c b/trunk/drivers/md/linear.c
index 627456542fb3..c3273efd08cb 100644
--- a/trunk/drivers/md/linear.c
+++ b/trunk/drivers/md/linear.c
@@ -230,7 +230,6 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
 		return -EINVAL;
 
 	rdev->raid_disk = rdev->saved_raid_disk;
-	rdev->saved_raid_disk = -1;
 
 	newconf = linear_conf(mddev,mddev->raid_disks+1);
 
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index f47f1f8ac44b..ee981737edfc 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -7360,7 +7360,8 @@ static int remove_and_add_spares(struct mddev *mddev)
 					spares++;
 					md_new_event(mddev);
 					set_bit(MD_CHANGE_DEVS, &mddev->flags);
-				}
+				} else
+					break;
 			}
 		}
 	}
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 858fdbb7eb07..31670f8d6b65 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -3065,17 +3065,11 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 			}
 		} else if (test_bit(In_sync, &rdev->flags))
 			set_bit(R5_Insync, &dev->flags);
-		else if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
+		else {
 			/* in sync if before recovery_offset */
-			set_bit(R5_Insync, &dev->flags);
-		else if (test_bit(R5_UPTODATE, &dev->flags) &&
-			 test_bit(R5_Expanded, &dev->flags))
-			/* If we've reshaped into here, we assume it is Insync.
-			 * We will shortly update recovery_offset to make
-			 * it official.
-			 */
-			set_bit(R5_Insync, &dev->flags);
-
+			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
+				set_bit(R5_Insync, &dev->flags);
+		}
 		if (rdev && test_bit(R5_WriteError, &dev->flags)) {
 			clear_bit(R5_Insync, &dev->flags);
 			if (!test_bit(Faulty, &rdev->flags)) {
diff --git a/trunk/net/bridge/br_netfilter.c b/trunk/net/bridge/br_netfilter.c
index d6ec3720c77e..08757dc670a4 100644
--- a/trunk/net/bridge/br_netfilter.c
+++ b/trunk/net/bridge/br_netfilter.c
@@ -114,12 +114,18 @@ static struct neighbour *fake_neigh_lookup(const struct dst_entry *dst, const vo
 	return NULL;
 }
 
+static unsigned int fake_mtu(const struct dst_entry *dst)
+{
+	return dst->dev->mtu;
+}
+
 static struct dst_ops fake_dst_ops = {
 	.family =		AF_INET,
 	.protocol =		cpu_to_be16(ETH_P_IP),
 	.update_pmtu =		fake_update_pmtu,
 	.cow_metrics =		fake_cow_metrics,
 	.neigh_lookup =		fake_neigh_lookup,
+	.mtu =			fake_mtu,
 };
 
 /*