diff --git a/[refs] b/[refs] index b4c6a393fd92..85c29a06a6d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cb681b9c7fff5cb35b5c05ba4f1b7e285e258fb +refs/heads/master: c60e81ee1cac32dae1f9bf623dcb6b3b2bde8eab diff --git a/trunk/fs/reiserfs/super.c b/trunk/fs/reiserfs/super.c index d50a5cd860ce..4b80ab95d338 100644 --- a/trunk/fs/reiserfs/super.c +++ b/trunk/fs/reiserfs/super.c @@ -1053,10 +1053,9 @@ static void handle_barrier_mode(struct super_block *s, unsigned long bits) { static void handle_attrs( struct super_block *s ) { - struct reiserfs_super_block * rs; + struct reiserfs_super_block * rs = SB_DISK_SUPER_BLOCK (s); if( reiserfs_attrs( s ) ) { - rs = SB_DISK_SUPER_BLOCK (s); if( old_format_only(s) ) { reiserfs_warning(s, "reiserfs: cannot support attributes on 3.5.x disk format" ); REISERFS_SB(s) -> s_mount_opt &= ~ ( 1 << REISERFS_ATTRS );