--- /dev/null
+From akpm@osdl.org Mon Feb 13 01:41:10 2006
+From: Jeff Mahoney <jeffm@suse.com>
+Date: Sun, 12 Feb 2006 22:34:55 +0000 (-0800)
+Subject: [PATCH] reiserfs: disable automatic enabling of reiserfs inode attributes
+X-Git-Tag: v2.6.16-rc3
+X-Git-Url: http://kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=89edc3d2b429136a0e25f40275fd82dc58f147fd
+
+[PATCH] reiserfs: disable automatic enabling of reiserfs inode attributes
+
+Unfortunately, the reiserfs_attrs_cleared bit in the superblock flag can
+lie. File systems have been observed with the bit set, yet still contain
+garbage in the stat data field, causing unpredictable results.
+
+This patch backs out the enable-by-default behavior.
+
+It eliminates the changes from: d50a5cd860ce721dbeac6a4f3c6e42abcde68cd8,
+and ef5e5414e7a83eb9b4295bbaba5464410b11e030.
+
+Signed-off-by: Jeff Mahoney <jeffm@suse.com>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+
+ fs/reiserfs/super.c | 2 --
+ 1 files changed, 2 deletions(-)
+
+--- linux-2.6.15.4.orig/fs/reiserfs/super.c
++++ linux-2.6.15.4/fs/reiserfs/super.c
+@@ -1130,8 +1130,6 @@ static void handle_attrs(struct super_bl
+ "reiserfs: cannot support attributes until flag is set in super-block");
+ REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS);
+ }
+- } else if (le32_to_cpu(rs->s_flags) & reiserfs_attrs_cleared) {
+- REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ATTRS);
+ }
+ }
+