Skip to content

Commit 1ac561a

Browse files
paliJosephChen2017
authored andcommitted
UPSTREAM: 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. Change-Id: I8daa938645cd75d0eb4269ff0994163a02c3ff13 Signed-off-by: Pali Rohár <[email protected]> Signed-off-by: Jon Lin <[email protected]> (cherry picked from commit b4f2105)
1 parent 410b6a2 commit 1ac561a

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

fs/ubifs/debug.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,7 @@ struct ubifs_global_debug_info {
174174
} \
175175
} while (0)
176176

177-
#define ubifs_assert_cmt_locked(c) do { \
178-
if (unlikely(down_write_trylock(&(c)->commit_sem))) { \
179-
up_write(&(c)->commit_sem); \
180-
pr_debug("commit lock is not locked!\n"); \
181-
ubifs_assert(0); \
182-
} \
183-
} while (0)
177+
#define ubifs_assert_cmt_locked(c) do { } while (0)
184178

185179
#define ubifs_dbg_msg(type, fmt, ...) \
186180
pr_debug("UBIFS DBG " type ": " fmt "\n", \

0 commit comments

Comments
 (0)