From 955a06fc55f32112b7f5b7a986e3d0157df5c2d0 Mon Sep 17 00:00:00 2001 From: Eran Matityahu Date: Wed, 13 Feb 2019 20:56:17 +0200 Subject: [PATCH] UPSTREAM: mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit Before printk.h was introduced and MTDDEBUG was removed, pr_crit() was calling MTDDEBUG(), which was since then replaced by the current pr_debug(). pr_debug is more appropriate here. Change-Id: Id553ff366acbb614f7a8adee6e8e46f79535be08 Signed-off-by: Eran Matityahu Reviewed-by: Heiko Schocher Signed-off-by: Jon Lin (cherry picked from commit 734b080e78805edbb3430a52c8c5b1aeee02bd9f) --- drivers/mtd/ubi/debug.h | 2 +- fs/ubifs/debug.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 2b9011d237..215fca7693 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -30,7 +30,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr); #else #define ubi_assert(expr) do { \ if (unlikely(!(expr))) { \ - pr_crit("UBI assert failed in %s at %u\n", \ + pr_debug("UBI assert failed in %s at %u\n", \ __func__, __LINE__); \ dump_stack(); \ } \ diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 807ce1b733..0d8ed57cbd 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -168,7 +168,7 @@ struct ubifs_global_debug_info { #else #define ubifs_assert(expr) do { \ if (unlikely(!(expr))) { \ - pr_crit("UBIFS assert failed in %s at %u\n", \ + pr_debug("UBIFS assert failed in %s at %u\n", \ __func__, __LINE__); \ dump_stack(); \ } \ @@ -177,7 +177,7 @@ struct ubifs_global_debug_info { #define ubifs_assert_cmt_locked(c) do { \ if (unlikely(down_write_trylock(&(c)->commit_sem))) { \ up_write(&(c)->commit_sem); \ - pr_crit("commit lock is not locked!\n"); \ + pr_debug("commit lock is not locked!\n"); \ ubifs_assert(0); \ } \ } while (0)