aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-05-15 20:09:28 +0200
committerJens Axboe <jens.axboe@oracle.com>2010-05-21 20:01:02 +0200
commit56bca01738733709bef076e2e97bbd01e5659f24 (patch)
treed4444fe75c7571a0fd9dd24df0ae7017b26cb7c5
parentfa4b9074cd8428958c2adf9dc0c831f46e27c193 (diff)
downloadkernel_samsung_smdk4412-56bca01738733709bef076e2e97bbd01e5659f24.tar.gz
kernel_samsung_smdk4412-56bca01738733709bef076e2e97bbd01e5659f24.tar.bz2
kernel_samsung_smdk4412-56bca01738733709bef076e2e97bbd01e5659f24.zip
block: restart partition scan after resizing a device
Device resize via ->set_capacity() can reveal new partitions (e.g. in chained partition table formats such as dos extended parts). Restart partition scan from the beginning after resizing a device. This change also makes libata always revalidate the disk after resize which makes lower layer native capacity unlocking implementation simpler and more robust as resize can be handled in the usual path. Signed-off-by: Tejun Heo <tj@kernel.org> Reported-by: Ben Hutchings <ben@decadent.org.uk> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--fs/partitions/check.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index e238ab23a9e..8f01df354f0 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -544,7 +544,7 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
struct hd_struct *part;
struct parsed_partitions *state;
int p, highest, res;
-
+rescan:
if (bdev->bd_part_count)
return -EBUSY;
res = invalidate_partition(disk, 0);
@@ -581,7 +581,7 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
/* add partitions */
for (p = 1; p < state->limit; p++) {
sector_t size, from;
-try_scan:
+
size = state->parts[p].size;
if (!size)
continue;
@@ -596,7 +596,6 @@ try_scan:
if (from + size > get_capacity(disk)) {
const struct block_device_operations *bdops = disk->fops;
- unsigned long long capacity;
printk(KERN_WARNING
"%s: p%d size %llu exceeds device capacity, ",
@@ -605,14 +604,11 @@ try_scan:
if (bdops->set_capacity &&
(disk->flags & GENHD_FL_NATIVE_CAPACITY) == 0) {
printk(KERN_CONT "enabling native capacity\n");
- capacity = bdops->set_capacity(disk, ~0ULL);
+ bdops->set_capacity(disk, ~0ULL);
disk->flags |= GENHD_FL_NATIVE_CAPACITY;
- if (capacity > get_capacity(disk)) {
- set_capacity(disk, capacity);
- check_disk_size_change(disk, bdev);
- bdev->bd_invalidated = 0;
- }
- goto try_scan;
+ /* free state and restart */
+ kfree(state);
+ goto rescan;
} else {
/*
* we can not ignore partitions of broken tables