Commit 4a8b719f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Link: https://lore.kernel.org/r/20230801172201.1923299-2-hch@lst.deSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d276bb29
...@@ -562,12 +562,6 @@ static int osync_buffers_list(spinlock_t *lock, struct list_head *list) ...@@ -562,12 +562,6 @@ static int osync_buffers_list(spinlock_t *lock, struct list_head *list)
return err; 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 * sync_mapping_buffers - write out & wait upon a mapping's "associated" buffers
* @mapping: the mapping which wants those buffers written * @mapping: the mapping which wants those buffers written
......
...@@ -23,16 +23,10 @@ struct mnt_idmap; ...@@ -23,16 +23,10 @@ struct mnt_idmap;
*/ */
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
extern void __init bdev_cache_init(void); extern void __init bdev_cache_init(void);
void emergency_thaw_bdev(struct super_block *sb);
#else #else
static inline void bdev_cache_init(void) static inline void bdev_cache_init(void)
{ {
} }
static inline int emergency_thaw_bdev(struct super_block *sb)
{
return 0;
}
#endif /* CONFIG_BLOCK */ #endif /* CONFIG_BLOCK */
/* /*
......
...@@ -1029,7 +1029,9 @@ static void do_thaw_all_callback(struct super_block *sb) ...@@ -1029,7 +1029,9 @@ static void do_thaw_all_callback(struct super_block *sb)
{ {
down_write(&sb->s_umount); down_write(&sb->s_umount);
if (sb->s_root && sb->s_flags & SB_BORN) { 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); thaw_super_locked(sb);
} else { } else {
up_write(&sb->s_umount); up_write(&sb->s_umount);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment