Commit: b4f210563e63e5d4b73e3232fd7156424533063e - uboot (git)

Commit MetaInfo

• Revision: b4f210563e63e5d4b73e3232fd7156424533063e (tree)
• Time: 2022-07-20 12:49:57
• Author: Pali Rohár <pali@kern...>
• Commiter: Heiko Schocher

Log Message

ubifs: Fix ubifs_assert_cmt_locked()

U-Boot does not implement down_write_trylock() and its stub always returns
true that lock was acquired. Therefore ubifs_assert_cmt_locked() assert
currently always fails.

Fix this issue by redefining ubifs_assert_cmt_locked() to just empty stub
as there is nothing to assert.

Signed-off-by: Pali Rohár <[e-mail]>

Change Summary

• modified: fs/ubifs/debug.h

Incremental Difference

--- a/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@ -173,13 +173,7 @@ struct ubifs_global_debug_info {
 	}                                                                      \
 } while (0)
 
-#define ubifs_assert_cmt_locked(c) do {                                        \
-	if (unlikely(down_write_trylock(&(c)->commit_sem))) {                  \
-		up_write(&(c)->commit_sem);                                    \
-		pr_debug("commit lock is not locked!\n");                      \
-		ubifs_assert(0);                                               \
-	}                                                                      \
-} while (0)
+#define ubifs_assert_cmt_locked(c) do { } while (0)
 
 #define ubifs_dbg_msg(type, fmt, ...) \
 	pr_debug("UBIFS DBG " type ": " fmt "\n",                              \