]> err.no Git - linux-2.6/commitdiff
[PATCH] reiserfs: disable automatic enabling of reiserfs inode attributes
authorJeff Mahoney <jeffm@suse.com>
Sun, 12 Feb 2006 22:34:55 +0000 (14:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 13 Feb 2006 00:10:47 +0000 (16:10 -0800)
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>
fs/reiserfs/super.c

index ef5e5414e7a83eb9b4295bbaba5464410b11e030..d63da756eb49b0096480b58adb519dc01bb2fdf5 100644 (file)
@@ -1124,8 +1124,6 @@ static void handle_attrs(struct super_block *s)
                                         "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);
        }
 }