diff --git a/[refs] b/[refs]
index 32d143e97fb3..e35c72664323 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 90f2447d08a5fbddc8b58f8a6425b0513807f919
+refs/heads/master: e78c9a004aadebe22306c81d1a7f1d1278dc37f9
diff --git a/trunk/fs/super.c b/trunk/fs/super.c
index 5a347a4f673a..0a30e51692cf 100644
--- a/trunk/fs/super.c
+++ b/trunk/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);
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index a1e28f0895c0..4c82219b0fae 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -808,7 +808,6 @@ struct super_block {
 	struct list_head	s_list;		/* Keep this first */
 	dev_t			s_dev;		/* search index; _not_ kdev_t */
 	unsigned long		s_blocksize;
-	unsigned long		s_old_blocksize;
 	unsigned char		s_blocksize_bits;
 	unsigned char		s_dirt;
 	unsigned long long	s_maxbytes;	/* Max file size */