block: remove the kill_dirty argument to __invalidate_device

It is always true.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/genhd.c b/block/genhd.c
index 9f8cb7beaad1160b249912919e6fcf4e1f9c1a11..c4270fff800f82825fd32575147a4f9c1fb6fac9 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -613,7 +613,7 @@ void del_gendisk(struct gendisk *disk)
        mutex_unlock(&disk->part0->bd_mutex);
 
        fsync_bdev(disk->part0);
-       __invalidate_device(disk->part0, true);
+       __invalidate_device(disk->part0);
 
        /*
         * Unhash the bdev inode for this device so that it can't be looked
@@ -1597,7 +1597,7 @@ bool bdev_check_media_change(struct block_device *bdev)
        if (!(events & DISK_EVENT_MEDIA_CHANGE))
                return false;
 
-       if (__invalidate_device(bdev, true))
+       if (__invalidate_device(bdev))
                pr_warn("VFS: busy inodes on changed media %s\n",
                        bdev->bd_disk->disk_name);
        set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);

diff --git a/block/partitions/core.c b/block/partitions/core.c
index dc60ecf46fe61b061ce525284fc556a54f0472a6..8108ec6e15c2bd571b57497e910d789f3a63685e 100644 (file)
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -288,7 +288,7 @@ struct device_type part_type = {
 static void delete_partition(struct block_device *part)
 {
        fsync_bdev(part);
-       __invalidate_device(part, true);
+       __invalidate_device(part);
 
        xa_erase(&part->bd_disk->part_tbl, part->bd_partno);
        kobject_put(part->bd_holder_dir);

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 8a9d22207c59cdf7b33eeb49ff251e94336d7a48..184f2678cf366acb02451ff89eb43237203dac73 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3224,7 +3224,7 @@ static int set_geometry(unsigned int cmd, struct floppy_struct *g,
                        struct block_device *bdev = opened_bdev[cnt];
                        if (!bdev || ITYPE(drive_state[cnt].fd_device) != type)
                                continue;
-                       __invalidate_device(bdev, true);
+                       __invalidate_device(bdev);
                }
                mutex_unlock(&open_lock);
        } else {

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 45d2c28c8fc8327ed28941923416272df2833fca..fb8de9c583a99b0b5bb383630e9085bb617664b7 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1344,7 +1344,7 @@ static void nbd_clear_sock_ioctl(struct nbd_device *nbd,
                                 struct block_device *bdev)
 {
        sock_shutdown(nbd);
-       __invalidate_device(bdev, true);
+       __invalidate_device(bdev);
        nbd_bdev_reset(bdev);
        if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,
                               &nbd->config->runtime_flags))

diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index e2b6c82586ce8bb6e57f605a1ad54a57522994d5..158c8f6eece9c0edf999387d09fefb15c65f9aaf 100644 (file)
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -225,7 +225,7 @@ static int ide_gd_open(struct block_device *bdev, fmode_t mode)
                 * and the door_lock is irrelevant at this point.
                 */
                drive->disk_ops->set_doorlock(drive, disk, 1);
-               if (__invalidate_device(bdev, true))
+               if (__invalidate_device(bdev))
                        pr_warn("VFS: busy inodes on changed media %s\n",
                                bdev->bd_disk->disk_name);
                drive->disk_ops->get_capacity(drive);

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6cc4d4cfe0c286dd3268969e834b59e2e9a284d7..2a9826a2680b504f458f49fabd6735abf5126134 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1889,7 +1889,7 @@ out_path_put:
 }
 EXPORT_SYMBOL(lookup_bdev);
 
-int __invalidate_device(struct block_device *bdev, bool kill_dirty)
+int __invalidate_device(struct block_device *bdev)
 {
        struct super_block *sb = get_super(bdev);
        int res = 0;
@@ -1902,7 +1902,7 @@ int __invalidate_device(struct block_device *bdev, bool kill_dirty)
                 * hold).
                 */
                shrink_dcache_sb(sb);
-               res = invalidate_inodes(sb, kill_dirty);
+               res = invalidate_inodes(sb, true);
                drop_super(sb);
        }
        invalidate_bdev(bdev);

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 6fc26f7bdf71ea48a7ca1693217f8be150d2d5d7..a809a46b640de0168d65f8daa166b9ef85cf99eb 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -284,7 +284,7 @@ int __register_blkdev(unsigned int major, const char *name,
 void unregister_blkdev(unsigned int major, const char *name);
 
 bool bdev_check_media_change(struct block_device *bdev);
-int __invalidate_device(struct block_device *bdev, bool kill_dirty);
+int __invalidate_device(struct block_device *bdev);
 void set_capacity(struct gendisk *disk, sector_t size);
 
 /* for drivers/char/raw.c: */