erofs: reliably distinguish block based and fscache mode

[linux-block.git] / fs / erofs / super.c

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index 21faa49bc9703eda90d155f82f9cadc79524369e..30b49b2eee53409a0b4b293a4ff579eceb2d5087 100644 (file)
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -789,17 +789,13 @@ static int erofs_init_fs_context(struct fs_context *fc)
 
 static void erofs_kill_sb(struct super_block *sb)
 {
-       struct erofs_sb_info *sbi;
+       struct erofs_sb_info *sbi = EROFS_SB(sb);
 
-       if (erofs_is_fscache_mode(sb))
+       if (IS_ENABLED(CONFIG_EROFS_FS_ONDEMAND) && sbi->fsid)
                kill_anon_super(sb);
        else
                kill_block_super(sb);
 
-       sbi = EROFS_SB(sb);
-       if (!sbi)
-               return;
-
        erofs_free_dev_context(sbi->devs);
        fs_put_dax(sbi->dax_dev, NULL);
        erofs_fscache_unregister_fs(sb);