From 711dcc3da36538c0d9d8a75eb33205b6d2708175 Mon Sep 17 00:00:00 2001 From: Zhihao Cheng Date: Mon, 11 Nov 2024 16:37:01 +0800 Subject: ubifs-utils: Adapt log.c in libubifs Adapt log.c in libubifs, compared with linux kernel implementations: 1. Remove debug related implementations(eg. dbg_check_bud_bytes), debug functions are not needed by fsck, because fsck will check fs in another way. Signed-off-by: Zhihao Cheng Signed-off-by: David Oberhollenzer --- ubifs-utils/libubifs/log.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'ubifs-utils') diff --git a/ubifs-utils/libubifs/log.c b/ubifs-utils/libubifs/log.c index b6ac9c4..0d45926 100644 --- a/ubifs-utils/libubifs/log.c +++ b/ubifs-utils/libubifs/log.c @@ -15,7 +15,13 @@ * journal. */ +#include "linux_err.h" +#include "bitops.h" +#include "kmem.h" #include "ubifs.h" +#include "defs.h" +#include "debug.h" +#include "misc.h" static int dbg_check_bud_bytes(struct ubifs_info *c); @@ -737,26 +743,7 @@ out_free: * ('c->bud_bytes' is correct). Returns zero in case of success and %-EINVAL in * case of failure. */ -static int dbg_check_bud_bytes(struct ubifs_info *c) +static int dbg_check_bud_bytes(__unused struct ubifs_info *c) { - int i, err = 0; - struct ubifs_bud *bud; - long long bud_bytes = 0; - - if (!dbg_is_chk_gen(c)) - return 0; - - spin_lock(&c->buds_lock); - for (i = 0; i < c->jhead_cnt; i++) - list_for_each_entry(bud, &c->jheads[i].buds_list, list) - bud_bytes += c->leb_size - bud->start; - - if (c->bud_bytes != bud_bytes) { - ubifs_err(c, "bad bud_bytes %lld, calculated %lld", - c->bud_bytes, bud_bytes); - err = -EINVAL; - } - spin_unlock(&c->buds_lock); - - return err; + return 0; } -- cgit v1.2.3