From 7096afa5e2bae1d461b6b4c3bfcd47c93269842e Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Mon, 31 May 2021 15:14:24 +0300
Subject: [PATCH] block: remove the kill_dirty argument to __invalidate_device

It is always true.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 block/genhd.c           | 4 ++--
 block/partitions/core.c | 2 +-
 drivers/block/floppy.c  | 2 +-
 drivers/block/nbd.c     | 2 +-
 drivers/ide/ide-gd.c    | 2 +-
 fs/block_dev.c          | 4 ++--
 include/linux/genhd.h   | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index 9f8cb7beaad1..c4270fff800f 100644
--- 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 dc60ecf46fe6..8108ec6e15c2 100644
--- 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 8a9d22207c59..184f2678cf36 100644
--- 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 45d2c28c8fc8..fb8de9c583a9 100644
--- 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 e2b6c82586ce..158c8f6eece9 100644
--- 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 6cc4d4cfe0c2..2a9826a2680b 100644
--- 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 6fc26f7bdf71..a809a46b640d 100644
--- 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: */
-- 
2.50.1