From nobody Thu Feb 12 21:55:41 2026 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF3DE61FFC for ; Fri, 7 Jun 2024 04:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.255 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734401; cv=none; b=Rl0HqxyQz2+N6/68bpotKfAOfcudzP3AHcNjvshBlK6CVhItv4nCIsxRAQkYxwlJFEkO6vmr9um6Tz1G+ouARiuEg709bjrqRksFTXo3jqHuCa/+uaW/T93cBWvUMhBUZYwImiMf5GcfJuLU5FmUS3ygwIO0k1hUis+cTG7anEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717734401; c=relaxed/simple; bh=/jvOs1AG1WNw7x7fdX0WtGgfUb52sPHx9xijjWoakNw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DnVjfFgqDDSUQIpsINz1gGXtuRpdcFi3/hUqCusZrxHK6ksUIOQTWDV5M7vo7fUPJjl8R7NbQyUvTXadobXAWr5Uk2aM+iRqSa5uuFEBL7dpCaxOxvq1quZXMjCHlpmGQgS+pu61p3bRNbVQOjxxqsUVUQ0zGUQ+2y4sZl4KG4E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.255 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4VwSj54Jh5z1S8tw; Fri, 7 Jun 2024 12:22:33 +0800 (CST) Received: from kwepemm600013.china.huawei.com (unknown [7.193.23.68]) by mail.maildlp.com (Postfix) with ESMTPS id 56FD518007E; Fri, 7 Jun 2024 12:26:32 +0800 (CST) Received: from huawei.com (10.175.104.67) by kwepemm600013.china.huawei.com (7.193.23.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 7 Jun 2024 12:26:31 +0800 From: Zhihao Cheng To: , , , , , CC: , Subject: [RFC PATCH mtd-utils 007/110] ubifs-utils: Move 'debug_level' into ubifs_info structure Date: Fri, 7 Jun 2024 12:24:32 +0800 Message-ID: <20240607042615.2069840-8-chengzhihao1@huawei.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240607042615.2069840-1-chengzhihao1@huawei.com> References: <20240607042615.2069840-1-chengzhihao1@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemm600013.china.huawei.com (7.193.23.68) Content-Type: text/plain; charset="utf-8" Embed new member 'debug_level' into 'ubifs_info' structure, then global variable 'debug_level' can be removed from mkfs.ubifs.c. Next patches will import UBIFS libs from linux kernel, which could print messages with different levels, then 'debug_level' can be used to control which level messages should be printed. Signed-off-by: Zhihao Cheng --- ubifs-utils/common/defs.h | 6 +++--- ubifs-utils/common/hashtable/hashtable.c | 1 + ubifs-utils/common/ubifs.h | 3 +++ ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 6 ++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ubifs-utils/common/defs.h b/ubifs-utils/common/defs.h index 56336b6a..cafc94af 100644 --- a/ubifs-utils/common/defs.h +++ b/ubifs-utils/common/defs.h @@ -12,6 +12,8 @@ #include #include =20 +#include "ubifs.h" + /* common.h requires the PROGRAM_NAME macro */ extern struct ubifs_info info_; #define PROGRAM_NAME (info_.program_name) @@ -21,9 +23,7 @@ extern struct ubifs_info info_; =20 enum { MKFS_PROGRAM_TYPE =3D 0 }; =20 -extern int debug_level; - -#define dbg_msg(lvl, fmt, ...) do {if (debug_level >=3D lvl) = \ +#define dbg_msg(lvl, fmt, ...) do {if (info_.debug_level >=3D lvl) \ printf("%s: %s: " fmt "\n", PROGRAM_NAME, __FUNCTION__, ##__VA_ARGS__); \ } while(0) =20 diff --git a/ubifs-utils/common/hashtable/hashtable.c b/ubifs-utils/common/= hashtable/hashtable.c index a3bae166..af7fed97 100644 --- a/ubifs-utils/common/hashtable/hashtable.c +++ b/ubifs-utils/common/hashtable/hashtable.c @@ -6,6 +6,7 @@ #include =20 #include "ubifs.h" +#include "defs.h" #include "hashtable.h" #include "hashtable_private.h" =20 diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h index 2b0ffe56..58aaba9b 100644 --- a/ubifs-utils/common/ubifs.h +++ b/ubifs-utils/common/ubifs.h @@ -273,6 +273,8 @@ struct ubifs_znode * @highest_inum: highest used inode number * @max_sqnum: current global sequence number * + * @debug_level: level of debug messages, 0 - none, 1 - statistics, + * 2 - files, 3 - more details * @program_type: used to identify the type of current program * @program_name: program name * @@ -363,6 +365,7 @@ struct ubifs_info ino_t highest_inum; unsigned long long max_sqnum; =20 + int debug_level; int program_type; const char *program_name; =20 diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/m= kfs.ubifs.c index 0bcaa5e4..51852861 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -138,8 +138,6 @@ struct ubifs_info info_; static struct ubifs_info *c =3D &info_; static libubi_t ubi; =20 -/* Debug levels are: 0 (none), 1 (statistics), 2 (files) ,3 (more details)= */ -int debug_level; int verbose; int yes; =20 @@ -657,9 +655,9 @@ static int get_options(int argc, char**argv) common_print_version(); exit(EXIT_SUCCESS); case 'g': - debug_level =3D strtol(optarg, &endp, 0); + c->debug_level =3D strtol(optarg, &endp, 0); if (*endp !=3D '\0' || endp =3D=3D optarg || - debug_level < 0 || debug_level > 3) + c->debug_level < 0 || c->debug_level > 3) return errmsg("bad debugging level '%s'", optarg); break; --=20 2.13.6