Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[safe/jmp/linux-2.6] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4eeb69a..d84f046 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -853,9 +853,60 @@ struct block_device *open_by_devnum(dev_t dev, unsigned mode)
 EXPORT_SYMBOL(open_by_devnum);
 
 /**
- * revalidate_disk - wrapper for lower-level driver's revalidate_disk
- *                   call-back
+ * flush_disk - invalidates all buffer-cache entries on a disk
  *
+ * @bdev:      struct block device to be flushed
+ *
+ * Invalidates all buffer-cache entries on a disk. It should be called
+ * when a disk has been changed -- either by a media change or online
+ * resize.
+ */
+static void flush_disk(struct block_device *bdev)
+{
+       if (__invalidate_device(bdev)) {
+               char name[BDEVNAME_SIZE] = "";
+
+               if (bdev->bd_disk)
+                       disk_name(bdev->bd_disk, 0, name);
+               printk(KERN_WARNING "VFS: busy inodes on changed media or "
+                      "resized disk %s\n", name);
+       }
+
+       if (!bdev->bd_disk)
+               return;
+       if (disk_partitionable(bdev->bd_disk))
+               bdev->bd_invalidated = 1;
+}
+
+/**
+ * check_disk_size_change - checks for disk size change and adjusts bdev size.
+ * @disk: struct gendisk to check
+ * @bdev: struct bdev to adjust.
+ *
+ * This routine checks to see if the bdev size does not match the disk size
+ * and adjusts it if it differs.
+ */
+void check_disk_size_change(struct gendisk *disk, struct block_device *bdev)
+{
+       loff_t disk_size, bdev_size;
+
+       disk_size = (loff_t)get_capacity(disk) << 9;
+       bdev_size = i_size_read(bdev->bd_inode);
+       if (disk_size != bdev_size) {
+               char name[BDEVNAME_SIZE];
+
+               disk_name(disk, 0, name);
+               printk(KERN_INFO
+                      "%s: detected capacity change from %lld to %lld\n",
+                      name, bdev_size, disk_size);
+               i_size_write(bdev->bd_inode, disk_size);
+               flush_disk(bdev);
+       }
+}
+EXPORT_SYMBOL(check_disk_size_change);
+
+/**
+ * revalidate_disk - wrapper for lower-level driver's revalidate_disk call-back
  * @disk: struct gendisk to be revalidated
  *
  * This routine is a wrapper for lower-level driver's revalidate_disk
@@ -864,11 +915,20 @@ EXPORT_SYMBOL(open_by_devnum);
  */
 int revalidate_disk(struct gendisk *disk)
 {
+       struct block_device *bdev;
        int ret = 0;
 
        if (disk->fops->revalidate_disk)
                ret = disk->fops->revalidate_disk(disk);
 
+       bdev = bdget_disk(disk, 0);
+       if (!bdev)
+               return ret;
+
+       mutex_lock(&bdev->bd_mutex);
+       check_disk_size_change(disk, bdev);
+       mutex_unlock(&bdev->bd_mutex);
+       bdput(bdev);
        return ret;
 }
 EXPORT_SYMBOL(revalidate_disk);
@@ -892,13 +952,9 @@ int check_disk_change(struct block_device *bdev)
        if (!bdops->media_changed(bdev->bd_disk))
                return 0;
 
-       if (__invalidate_device(bdev))
-               printk("VFS: busy inodes on changed media.\n");
-
+       flush_disk(bdev);
        if (bdops->revalidate_disk)
                bdops->revalidate_disk(bdev->bd_disk);
-       if (disk_partitionable(bdev->bd_disk))
-               bdev->bd_invalidated = 1;
        return 1;
 }
 
@@ -1206,10 +1262,9 @@ EXPORT_SYMBOL(ioctl_by_bdev);
 
 /**
  * lookup_bdev  - lookup a struct block_device by name
+ * @pathname:  special file representing the block device
  *
- * @path:      special file representing the block device
- *
- * Get a reference to the blockdevice at @path in the current
+ * Get a reference to the blockdevice at @pathname in the current
  * namespace if possible and return it.  Return ERR_PTR(error)
  * otherwise.
  */