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 74ed5aae6cea393755ee6968de0a1df20f689036..3b713b6fcc26ba688cd1fafa9134d628c4542154 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -202,27 +202,25 @@ 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[4];
+       char lvl[PRINTK_MAX_SINGLE_HEADER_LEN + 1] = "\0";
        struct va_format vaf;
        va_list args;
-       const char *type = logtypes[4];
        int kern_level;
-       struct ratelimit_state *ratelimit;
+       const char *type = logtypes[4];
+       struct ratelimit_state *ratelimit = &printk_limits[4];
 
        va_start(args, fmt);
 
-       kern_level = printk_get_level(fmt);
-       if (kern_level) {
+       while ((kern_level = printk_get_level(fmt)) != 0) {
                size_t size = printk_skip_level(fmt) - fmt;
-               memcpy(lvl, fmt,  size);
-               lvl[size] = '\0';
+
+               if (kern_level >= '0' && kern_level <= '7') {
+                       memcpy(lvl, fmt,  size);
+                       lvl[size] = '\0';
+                       type = logtypes[kern_level - '0'];
+                       ratelimit = &printk_limits[kern_level - '0'];
+               }
                fmt += size;
-               type = logtypes[kern_level - '0'];
-               ratelimit = &printk_limits[kern_level - '0'];
-       } else {
-               *lvl = '\0';
-               /* Default to debug output */
-               ratelimit = &printk_limits[7];
        }
 
        vaf.fmt = fmt;