diff options
Diffstat (limited to 'fs/block_dev.c')
-rw-r--r-- | fs/block_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index a85fe310fc6f..a29b4dcc1bca 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
@@ -76,7 +76,7 @@ int set_blocksize(struct block_device *bdev, int size) | |||
76 | return -EINVAL; | 76 | return -EINVAL; |
77 | 77 | ||
78 | /* Size cannot be smaller than the size supported by the device */ | 78 | /* Size cannot be smaller than the size supported by the device */ |
79 | if (size < bdev_hardsect_size(bdev)) | 79 | if (size < bdev_logical_block_size(bdev)) |
80 | return -EINVAL; | 80 | return -EINVAL; |
81 | 81 | ||
82 | /* Don't change the size if it is same as current */ | 82 | /* Don't change the size if it is same as current */ |
@@ -106,7 +106,7 @@ EXPORT_SYMBOL(sb_set_blocksize); | |||
106 | 106 | ||
107 | int sb_min_blocksize(struct super_block *sb, int size) | 107 | int sb_min_blocksize(struct super_block *sb, int size) |
108 | { | 108 | { |
109 | int minsize = bdev_hardsect_size(sb->s_bdev); | 109 | int minsize = bdev_logical_block_size(sb->s_bdev); |
110 | if (size < minsize) | 110 | if (size < minsize) |
111 | size = minsize; | 111 | size = minsize; |
112 | return sb_set_blocksize(sb, size); | 112 | return sb_set_blocksize(sb, size); |
@@ -1117,7 +1117,7 @@ EXPORT_SYMBOL(check_disk_change); | |||
1117 | 1117 | ||
1118 | void bd_set_size(struct block_device *bdev, loff_t size) | 1118 | void bd_set_size(struct block_device *bdev, loff_t size) |
1119 | { | 1119 | { |
1120 | unsigned bsize = bdev_hardsect_size(bdev); | 1120 | unsigned bsize = bdev_logical_block_size(bdev); |
1121 | 1121 | ||
1122 | bdev->bd_inode->i_size = size; | 1122 | bdev->bd_inode->i_size = size; |
1123 | while (bsize < PAGE_CACHE_SIZE) { | 1123 | while (bsize < PAGE_CACHE_SIZE) { |