Merge Linus' tree.

[linux-2.6] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 5a347a4f673a4aa19294b8436a25adc71ba07a38..0a30e51692cf69579bf51670bb2a6f8cb56f0626 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -700,8 +700,7 @@ struct super_block *get_sb_bdev(struct file_system_type *fs_type,
 
                s->s_flags = flags;
                strlcpy(s->s_id, bdevname(bdev, b), sizeof(s->s_id));
-               s->s_old_blocksize = block_size(bdev);
-               sb_set_blocksize(s, s->s_old_blocksize);
+               sb_set_blocksize(s, block_size(bdev));
                error = fill_super(s, data, flags & MS_VERBOSE ? 1 : 0);
                if (error) {
                        up_write(&s->s_umount);