From patchwork Wed Jun 28 11:08:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Oberhollenzer X-Patchwork-Id: 781551 X-Patchwork-Delegate: david.oberhollenzer@sigma-star.at Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wyKn21xsBz9s75 for ; Wed, 28 Jun 2017 21:09:26 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FJaQ/1WP"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Bt9jlKtUdor2wThhUcySr7qazRelG8hYwJwaaWwdJCk=; b=FJaQ/1WP5PyWxykhgrzag2S1P0 PQRqywJ3K5S6Aft72tjdWDDznNwSHEXNODGXjG+N4lW9goqZ/YlepAT77KCivB7BLI1uomRSbU0zp QSuWkiwavpBiw0ilenC0ZARhAxIBJbDznaQqzzSl08rvphNvfLv3E8VGuhIGRzJJ6S8B3FEX5FfcE QqBY10lx9kVlndW5JN2Ki7O7mmyIImwRTHUVgUg/j99lDszMtXzAKCxsFIgtZUssEbzErXeH38dnV tPpPEYZZaIbLgXhJ8mayoNnuc3lRzNqMDE5PnhW0K427uM5USAyDIe8xTlSSZNr4GaNGjGqyiF9a3 hssLsdAA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dQAqW-0006r9-0U; Wed, 28 Jun 2017 11:09:20 +0000 Received: from mail.sigma-star.at ([95.130.255.111]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dQAqJ-0006a0-Ro for linux-mtd@lists.infradead.org; Wed, 28 Jun 2017 11:09:11 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.sigma-star.at (Postfix) with ESMTP id 21AFB24E001C for ; Wed, 28 Jun 2017 13:08:43 +0200 (CEST) Received: from linux-4sv6.suse (unknown [82.150.214.13]) by mail.sigma-star.at (Postfix) with ESMTPSA id D568F24E0011; Wed, 28 Jun 2017 13:08:41 +0200 (CEST) From: David Oberhollenzer To: linux-mtd@lists.infradead.org Subject: [PATCH 1/9] Replace defunct ubifs_assert Date: Wed, 28 Jun 2017 13:08:11 +0200 Message-Id: <20170628110819.30563-2-david.oberhollenzer@sigma-star.at> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170628110819.30563-1-david.oberhollenzer@sigma-star.at> References: <20170628110819.30563-1-david.oberhollenzer@sigma-star.at> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170628_040908_238203_862FB487 X-CRM114-Status: GOOD ( 11.29 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Oberhollenzer MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The ubifs assert defined in defs.h was only used in three places inside key.h and defined to never perform any checks at all. This patch replaces ubifs_assert in mkfs.ubifs with the regular libc assert macro. Signed-off-by: David Oberhollenzer --- ubifs-utils/mkfs.ubifs/defs.h | 2 -- ubifs-utils/mkfs.ubifs/key.h | 8 +++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ubifs-utils/mkfs.ubifs/defs.h b/ubifs-utils/mkfs.ubifs/defs.h index 1fa3316..8db5277 100644 --- a/ubifs-utils/mkfs.ubifs/defs.h +++ b/ubifs-utils/mkfs.ubifs/defs.h @@ -31,8 +31,6 @@ #define unlikely(x) (x) -#define ubifs_assert(x) ({}) - struct qstr { char *name; diff --git a/ubifs-utils/mkfs.ubifs/key.h b/ubifs-utils/mkfs.ubifs/key.h index 118858b..cd4b849 100644 --- a/ubifs-utils/mkfs.ubifs/key.h +++ b/ubifs-utils/mkfs.ubifs/key.h @@ -37,6 +37,8 @@ #ifndef __UBIFS_KEY_H__ #define __UBIFS_KEY_H__ +#include + /** * key_mask_hash - mask a valid hash value. * @val: value to be masked @@ -113,7 +115,7 @@ static inline void dent_key_init(const struct ubifs_info *c, { uint32_t hash = c->key_hash(nm->name, nm->len); - ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); + assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); key->u32[0] = inum; key->u32[1] = hash | (UBIFS_DENT_KEY << UBIFS_S_KEY_HASH_BITS); } @@ -131,7 +133,7 @@ static inline void xent_key_init(const struct ubifs_info *c, { uint32_t hash = c->key_hash(nm->name, nm->len); - ubifs_assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); + assert(!(hash & ~UBIFS_S_KEY_HASH_MASK)); key->u32[0] = inum; key->u32[1] = hash | (UBIFS_XENT_KEY << UBIFS_S_KEY_HASH_BITS); } @@ -146,7 +148,7 @@ static inline void xent_key_init(const struct ubifs_info *c, static inline void data_key_init(union ubifs_key *key, ino_t inum, unsigned int block) { - ubifs_assert(!(block & ~UBIFS_S_KEY_BLOCK_MASK)); + assert(!(block & ~UBIFS_S_KEY_BLOCK_MASK)); key->u32[0] = inum; key->u32[1] = block | (UBIFS_DATA_KEY << UBIFS_S_KEY_BLOCK_BITS); }