Commit 4a8b719f authored Aug 01, 2023 by Christoph Hellwig Committed by Jens Axboe Aug 02, 2023

fs: remove emergency_thaw_bdev



Fold emergency_thaw_bdev into it's only caller, to prepare for buffer.c
to be built only when buffer_head support is enabled.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Christian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230801172201.1923299-2-hch@lst.de


Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent d276bb29

fs/buffer.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -562,12 +562,6 @@ static int osync_buffers_list(spinlock_t lock, struct list_head list)
		return err;
		}

		void emergency_thaw_bdev(struct super_block *sb)
		{
		while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
		printk(KERN_WARNING "Emergency Thaw on %pg\n", sb->s_bdev);
		}

		/**
		* sync_mapping_buffers - write out & wait upon a mapping's "associated" buffers
		* @mapping: the mapping which wants those buffers written

fs/internal.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -23,16 +23,10 @@ struct mnt_idmap;
		*/
		#ifdef CONFIG_BLOCK
		extern void __init bdev_cache_init(void);

		void emergency_thaw_bdev(struct super_block *sb);
		#else
		static inline void bdev_cache_init(void)
		{
		}
		static inline int emergency_thaw_bdev(struct super_block *sb)
		{
		return 0;
		}
		#endif /* CONFIG_BLOCK */

		/*

fs/super.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1029,7 +1029,9 @@ static void do_thaw_all_callback(struct super_block *sb)
		{
		down_write(&sb->s_umount);
		if (sb->s_root && sb->s_flags & SB_BORN) {
		emergency_thaw_bdev(sb);
		if (IS_ENABLED(CONFIG_BLOCK))
		while (sb->s_bdev && !thaw_bdev(sb->s_bdev))
		pr_warn("Emergency Thaw on %pg\n", sb->s_bdev);
		thaw_super_locked(sb);
		} else {
		up_write(&sb->s_umount);