Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / fs / btrfs / super.c

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 180f910339f414307f9b9bf405c635e54104149a..3b713b6fcc26ba688cd1fafa9134d628c4542154 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -202,12 +202,12 @@ static struct ratelimit_state printk_limits[] = {
 void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
 {
        struct super_block *sb = fs_info->sb;
-       char lvl[PRINTK_MAX_SINGLE_HEADER_LEN + 1];
+       char lvl[PRINTK_MAX_SINGLE_HEADER_LEN + 1] = "\0";
        struct va_format vaf;
        va_list args;
-       const char *type = NULL;
        int kern_level;
-       struct ratelimit_state *ratelimit;
+       const char *type = logtypes[4];
+       struct ratelimit_state *ratelimit = &printk_limits[4];
 
        va_start(args, fmt);
 
@@ -223,12 +223,6 @@ void btrfs_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)
                fmt += size;
        }
 
-       if (!type) {
-               *lvl = '\0';
-               type = logtypes[4];
-               ratelimit = &printk_limits[4];
-       }
-
        vaf.fmt = fmt;
        vaf.va = &args;