2 files changed, 7 insertions, 4 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 78fba44ad3d9..1e3a994e1899 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3653,11 +3653,14 @@ __printf(5, 6)
 void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
                    unsigned int line, int errno, const char *fmt, ...);
 
+/*
+ * If BTRFS_MOUNT_PANIC_ON_FATAL_ERROR is in mount_opt, __btrfs_panic
+ * will panic().  Otherwise we BUG() here.
+ */
 #define btrfs_panic(fs_info, errno, fmt, args...)                       \
 do {                                                                    \
-        struct btrfs_fs_info *_i = (fs_info);                           \
-        __btrfs_panic(_i, __func__, __LINE__, errno, fmt, ##args);      \
-        BUG_ON(!(_i->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR));    \
+        __btrfs_panic(fs_info, __func__, __LINE__, errno, fmt, ##args); \
+        BUG();                                                          \
 } while (0)
 
 /* acl.c */
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index fd6a07c30ee9..06537d217419 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -289,7 +289,7 @@ void __btrfs_panic(struct btrfs_fs_info *fs_info, const char *function,
         vaf.va = &args;
 
         errstr = btrfs_decode_error(errno, nbuf);
-        if (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR)
+        if (fs_info && (fs_info->mount_opt & BTRFS_MOUNT_PANIC_ON_FATAL_ERROR))
                 panic(KERN_CRIT "BTRFS panic (device %s) in %s:%d: %pV (%s)\n",
                         s_id, function, line, &vaf, errstr);