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>

diff --git a/fs/buffer.c b/fs/buffer.c
index bd091329026c0fe5914f83a16478091b7d0da0a4..376f468e16662dd81e6a8ca47151d0d985cdbec8 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -562,12 +562,6 @@ repeat:
        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

diff --git a/fs/internal.h b/fs/internal.h
index f7a3dc1110264772b38173471f3aa925cbd0d474..d538d832fd608bfe5de20c38918b2a26c61c6e6a 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -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 */
 
 /*

diff --git a/fs/super.c b/fs/super.c
index e781226e28800c8ad23711e87c52d4fdafc302fc..bc666e7ee1a9848f48fa7ed78ebf22bd83d98dbc 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -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);