3.4-stable patches

added patches:
	ext4-don-t-set-i_flags-in-ext4_ioc_setflags.patch

diff --git a/queue-3.4/ext4-don-t-set-i_flags-in-ext4_ioc_setflags.patch b/queue-3.4/ext4-don-t-set-i_flags-in-ext4_ioc_setflags.patch
new file mode 100644 (file)
index 0000000..0b5bfc2
--- /dev/null
+++ b/queue-3.4/ext4-don-t-set-i_flags-in-ext4_ioc_setflags.patch
@@ -0,0 +1,32 @@
+From b22b1f178f6799278d3178d894f37facb2085765 Mon Sep 17 00:00:00 2001
+From: Tao Ma <boyu.mt@taobao.com>
+Date: Thu, 7 Jun 2012 19:04:19 -0400
+Subject: ext4: don't set i_flags in EXT4_IOC_SETFLAGS
+
+From: Tao Ma <boyu.mt@taobao.com>
+
+commit b22b1f178f6799278d3178d894f37facb2085765 upstream.
+
+Commit 7990696 uses the ext4_{set,clear}_inode_flags() functions to
+change the i_flags automatically but fails to remove the error setting
+of i_flags.  So we still have the problem of trashing state flags.
+Fix this by removing the assignment.
+
+Signed-off-by: Tao Ma <boyu.mt@taobao.com>
+Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ext4/ioctl.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/ext4/ioctl.c
++++ b/fs/ext4/ioctl.c
+@@ -123,7 +123,6 @@ long ext4_ioctl(struct file *filp, unsig
+                       else
+                               ext4_clear_inode_flag(inode, i);
+               }
+-              ei->i_flags = flags;
+ 
+               ext4_set_inode_flags(inode);
+               inode->i_ctime = ext4_current_time(inode);

diff --git a/queue-3.4/series b/queue-3.4/series
index e3cdc5788465cf79cb462f71670f04a03bb6e362..678227b9d25f305c8d61ca165752ede9b8758086 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -80,3 +80,4 @@ drm-i915-always-use-rpnswreq-for-turbo-change-requests.patch
 drm-i915-dp-flush-any-outstanding-work-to-turn-the-vdd-off.patch
 drm-i915-enable-vdd-when-switching-off-the-edp-panel.patch
 ia64-add-cmpxchg.h-to-exported-userspace-headers.patch
+ext4-don-t-set-i_flags-in-ext4_ioc_setflags.patch