.32 patches

3 files changed, 100 insertions, 0 deletions

diff --git a/queue-2.6.32/drivers-net-rionet.c-fix-ethernet-address-macros-for-le-platforms.patch b/queue-2.6.32/drivers-net-rionet.c-fix-ethernet-address-macros-for-le-platforms.patch
new file mode 100644
index 0000000..20a8b9f
--- /dev/null
+++ b/queue-2.6.32/drivers-net-rionet.c-fix-ethernet-address-macros-for-le-platforms.patch
@@ -0,0 +1,37 @@
+From e0c87bd95e8dad455c23bc56513af8dcb1737e55 Mon Sep 17 00:00:00 2001
+From: Alexandre Bounine <alexandre.bounine@idt.com>
+Date: Wed, 2 Nov 2011 13:39:15 -0700
+Subject: drivers/net/rionet.c: fix ethernet address macros for LE platforms
+
+From: Alexandre Bounine <alexandre.bounine@idt.com>
+
+commit e0c87bd95e8dad455c23bc56513af8dcb1737e55 upstream.
+
+Modify Ethernet addess macros to be compatible with BE/LE platforms
+
+Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
+Cc: Chul Kim <chul.kim@idt.com>
+Cc: Kumar Gala <galak@kernel.crashing.org>
+Cc: Matt Porter <mporter@kernel.crashing.org>
+Cc: Li Yang <leoli@freescale.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/rionet.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/rionet.c
++++ b/drivers/net/rionet.c
+@@ -87,8 +87,8 @@ static struct rio_dev **rionet_active;
+ #define dev_rionet_capable(dev) \
+ 	is_rionet_capable(dev->pef, dev->src_ops, dev->dst_ops)
+ 
+-#define RIONET_MAC_MATCH(x)	(*(u32 *)x == 0x00010001)
+-#define RIONET_GET_DESTID(x)	(*(u16 *)(x + 4))
++#define RIONET_MAC_MATCH(x)	(!memcmp((x), "\00\01\00\01", 4))
++#define RIONET_GET_DESTID(x)	((*((u8 *)x + 4) << 8) | *((u8 *)x + 5))
+ 
+ static int rionet_rx_clean(struct net_device *ndev)
+ {
diff --git a/queue-2.6.32/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch b/queue-2.6.32/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
new file mode 100644
index 0000000..8837a43
--- /dev/null
+++ b/queue-2.6.32/ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
@@ -0,0 +1,61 @@
+From gnehzuil.liu@gmail.com  Thu Nov  3 10:42:14 2011
+From: Zheng Liu <gnehzuil.liu@gmail.com>
+Date: Fri, 28 Oct 2011 20:34:02 +0800
+Subject: ext4: fix BUG_ON() in ext4_ext_insert_extent()
+To: Greg KH <greg@kroah.com>
+Cc: Ted Ts'o <tytso@mit.edu>, Tao Ma <tm@tao.ma>, linux-ext4@vger.kernel.org, Xiaoyun Mao <xiaoyun.maoxy@aliyun-inc.com>, Yingbin Wang <yingbin.wangyb@aliyun-inc.com>, Jia Wan <jia.wanj@aliyun-inc.com>
+Message-ID: <20111028123402.GA26003@gmail.com>
+
+
+From: Zheng Liu <wenqing.lz@taobao.com>
+
+Does not corrispond with a direct commit in Linus's tree as it was fixed
+differently in the 3.0 release.
+
+
+We will meet with a BUG_ON() if following script is run.
+
+mkfs.ext4 -b 4096 /dev/sdb1 1000000
+mount -t ext4 /dev/sdb1 /mnt/sdb1
+fallocate -l 100M /mnt/sdb1/test
+sync
+for((i=0;i<170;i++))
+do
+        dd if=/dev/zero of=/mnt/sdb1/test conv=notrunc bs=256k count=1
+seek=`expr $i \* 2`
+done
+umount /mnt/sdb1
+mount -t ext4 /dev/sdb1 /mnt/sdb1
+dd if=/dev/zero of=/mnt/sdb1/test conv=notrunc bs=256k count=1 seek=341
+umount /mnt/sdb1
+mount /dev/sdb1 /mnt/sdb1
+dd if=/dev/zero of=/mnt/sdb1/test conv=notrunc bs=256k count=1 seek=340
+sync
+
+The reason is that it forgot to mark dirty when splitting two extents in
+ext4_ext_convert_to_initialized(). Althrough ex has been updated in
+memory, it is not dirtied both in ext4_ext_convert_to_initialized() and
+ext4_ext_insert_extent(). The disk layout is corrupted. Then it will
+meet with a BUG_ON() when writting at the start of that extent again.
+
+Cc: "Theodore Ts'o" <tytso@mit.edu>
+Cc: Xiaoyun Mao <xiaoyun.maoxy@aliyun-inc.com>
+Cc: Yingbin Wang <yingbin.wangyb@aliyun-inc.com>
+Cc: Jia Wan <jia.wanj@aliyun-inc.com>
+Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/ext4/extents.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -2592,6 +2592,7 @@ static int ext4_ext_convert_to_initializ
+ 		ex1 = ex;
+ 		ex1->ee_len = cpu_to_le16(iblock - ee_block);
+ 		ext4_ext_mark_uninitialized(ex1);
++		ext4_ext_dirty(handle, inode, path + depth);
+ 		ex2 = &newex;
+ 	}
+ 	/*
diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index d85e2f0..8d9fd19 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -104,3 +104,5 @@ vm-fix-vm_pgoff-wrap-in-upward-expansion.patch
 bluetooth-prevent-buffer-overflow-in-l2cap-config-request.patch
 nl80211-fix-overflow-in-ssid_len.patch
 net_sched-fix-qdisc_notify.patch
+ext4-fix-bug_on-in-ext4_ext_insert_extent.patch
+drivers-net-rionet.c-fix-ethernet-address-macros-for-le-platforms.patch