Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 660aefca1fd2..d50a5cd860ce 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -1066,6 +1066,8 @@ static void handle_attrs( struct super_block *s )
                                 reiserfs_warning(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 |= REISERFS_ATTRS;
         }
 }