Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / fs / ext3 / super.c

diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index d8b73d4abe3ebeaa3d993a9e4c5f7e33410ca83d..3c70d52afb10b0829d9cc262559745c1f985eaa5 100644 (file)
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -1696,7 +1696,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
                goto failed_mount;
        }
 
-       hblock = bdev_hardsect_size(sb->s_bdev);
+       hblock = bdev_logical_block_size(sb->s_bdev);
        if (sb->s_blocksize != blocksize) {
                /*
                 * Make sure the blocksize for the filesystem is larger
@@ -2120,7 +2120,7 @@ static journal_t *ext3_get_dev_journal(struct super_block *sb,
        }
 
        blocksize = sb->s_blocksize;
-       hblock = bdev_hardsect_size(bdev);
+       hblock = bdev_logical_block_size(bdev);
        if (blocksize < hblock) {
                printk(KERN_ERR
                        "EXT3-fs: blocksize too small for journal device.\n");