From patchwork Mon Jun 27 18:27:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 102251 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 67D7FB6F68 for ; Tue, 28 Jun 2011 04:29:27 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QbGYY-0007bF-Qt; Mon, 27 Jun 2011 18:29:12 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QbGYW-0003Nk-6y; Mon, 27 Jun 2011 18:29:08 +0000 Received: from mms3.broadcom.com ([216.31.210.19]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QbGY6-0003FX-Qb for linux-mtd@lists.infradead.org; Mon, 27 Jun 2011 18:28:46 +0000 Received: from [10.9.200.133] by MMS3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Mon, 27 Jun 2011 11:32:50 -0700 X-Server-Uuid: B55A25B1-5D7D-41F8-BC53-C57E7AD3C201 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Mon, 27 Jun 2011 11:28:18 -0700 Received: from localhost.localdomain (ld-irv-0074 [10.12.160.50]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 3661274D03; Mon, 27 Jun 2011 11:28:30 -0700 (PDT) From: "Brian Norris" To: "Artem Bityutskiy" Subject: [PATCH 05/10] mkfs.ubifs: use common.h Date: Mon, 27 Jun 2011 11:27:22 -0700 Message-ID: <1309199247-19248-6-git-send-email-computersforpeace@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1309199247-19248-1-git-send-email-computersforpeace@gmail.com> References: <1309199247-19248-1-git-send-email-computersforpeace@gmail.com> MIME-Version: 1.0 X-WSS-ID: 621613585384974706-01-01 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110627_142843_263070_33D597AC X-CRM114-Status: UNSURE ( 9.80 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (computersforpeace[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: Brian Norris , linux-mtd@lists.infradead.org, Mike Frysinger X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org To use more unified versioning and to re-use other existing code, switch to common.h. Signed-off-by: Brian Norris --- mkfs.ubifs/mkfs.ubifs.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mkfs.ubifs/mkfs.ubifs.c b/mkfs.ubifs/mkfs.ubifs.c index ac3c8d3..c718818 100644 --- a/mkfs.ubifs/mkfs.ubifs.c +++ b/mkfs.ubifs/mkfs.ubifs.c @@ -20,8 +20,11 @@ * Zoltan Sogor */ +#define PROGRAM_NAME "mkfs.ubifs" + #include "mkfs.ubifs.h" #include +#include "common.h" #define PROGRAM_VERSION "1.5" @@ -390,11 +393,6 @@ static long long add_space_overhead(long long size) return size / divisor; } -static inline int is_power_of_2(unsigned long long n) -{ - return (n != 0 && ((n & (n - 1)) == 0)); -} - static int validate_options(void) { int tmp;