Messages in this thread Patch in this message | | | Date | Wed, 01 Jun 2011 16:59:18 +0900 | From | Greg KH <> | Subject | [022/146] block: move bd_set_size() above rescan_partitions() in |
| |
2.6.38-stable review patch. If anyone has any objections, please let us know.
------------------ __blkdev_get()
From: Tejun Heo <tj@kernel.org>
commit 7e69723fef8771a9d57bd27d36281d756130b4b5 upstream.
02e352287a4 (block: rescan partitions on invalidated devices on -ENOMEDIA too) relocated partition rescan above explicit bd_set_size() to simplify condition check. As rescan_partitions() does its own bdev size setting, this doesn't break anything; however, rescan_partitions() prints out the following messages when adjusting bdev size, which can be confusing.
sda: detected capacity change from 0 to 146815737856 sdb: detected capacity change from 0 to 146815737856
This patch restores the original order and remove the warning messages.
stable: Please apply together with 02e352287a4 (block: rescan partitions on invalidated devices on -ENOMEDIA too).
Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Tony Luck <tony.luck@gmail.com> Tested-by: Tony Luck <tony.luck@gmail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- fs/block_dev.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
--- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1116,6 +1116,15 @@ static int __blkdev_get(struct block_dev goto restart; } } + + if (!ret && !bdev->bd_openers) { + bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); + bdi = blk_get_backing_dev_info(bdev); + if (bdi == NULL) + bdi = &default_backing_dev_info; + bdev_inode_switch_bdi(bdev->bd_inode, bdi); + } + /* * If the device is invalidated, rescan partition * if open succeeded or failed with -ENOMEDIUM. @@ -1126,14 +1135,6 @@ static int __blkdev_get(struct block_dev rescan_partitions(disk, bdev); if (ret) goto out_clear; - - if (!bdev->bd_openers) { - bd_set_size(bdev,(loff_t)get_capacity(disk)<<9); - bdi = blk_get_backing_dev_info(bdev); - if (bdi == NULL) - bdi = &default_backing_dev_info; - bdev_inode_switch_bdi(bdev->bd_inode, bdi); - } } else { struct block_device *whole; whole = bdget_disk(disk, 0);
| |