2 files changed, 8 insertions, 0 deletions

diff --git a/fs/reiserfs/ioctl.c b/fs/reiserfs/ioctl.c
index 94dc42475a04..76caedf737f2 100644
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
@@ -36,10 +36,16 @@ int reiserfs_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
         /* following two cases are taken from fs/ext2/ioctl.c by Remy
            Card (card@masi.ibp.fr) */
         case REISERFS_IOC_GETFLAGS:
+                if (!reiserfs_attrs (inode->i_sb))
+                        return -ENOTTY;
+
                 flags = REISERFS_I(inode) -> i_attrs;
                 i_attrs_to_sd_attrs( inode, ( __u16 * ) &flags );
                 return put_user(flags, (int __user *) arg);
         case REISERFS_IOC_SETFLAGS: {
+                if (!reiserfs_attrs (inode->i_sb))
+                        return -ENOTTY;
+
                 if (IS_RDONLY(inode))
                         return -EROFS;
 
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;
         }
 }