From patchwork Thu Jun 9 09:05:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 99704 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 B52D6B6FE8 for ; Thu, 9 Jun 2011 19:19:14 +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 1QUbOG-0000LJ-Ou; Thu, 09 Jun 2011 09:19:00 +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 1QUbOG-0003c8-AO; Thu, 09 Jun 2011 09:19:00 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QUbO5-0003Y8-8F for linux-mtd@canuck.infradead.org; Thu, 09 Jun 2011 09:18:49 +0000 Received: from smtp.nokia.com ([147.243.1.47] helo=mgw-sa01.nokia.com) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QUb7K-0002OU-9P for linux-mtd@lists.infradead.org; Thu, 09 Jun 2011 09:01:30 +0000 Received: from eru.research.nokia.com (esdhcp038109.research.nokia.com [172.21.38.109]) by mgw-sa01.nokia.com (Switch-3.4.4/Switch-3.4.3) with ESMTP id p5990wER028399 for ; Thu, 9 Jun 2011 12:01:09 +0300 From: Artem Bityutskiy To: linux-mtd@lists.infradead.org Subject: [PATCH 27/30] UBIFS: stop re-defining UBI operations Date: Thu, 9 Jun 2011 12:05:07 +0300 Message-Id: <1307610310-28691-28-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1307610310-28691-1-git-send-email-dedekind1@gmail.com> References: <1307610310-28691-1-git-send-email-dedekind1@gmail.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110609_100130_497842_52EADDA6 X-CRM114-Status: GOOD ( 11.25 ) X-Spam-Score: 1.3 (+) X-Spam-Report: SpamAssassin version 3.3.2-r929478 on casper.infradead.org summary: Content analysis details: (1.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.47 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dedekind1[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 0.8 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) 1.6 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (dedekind1[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.9 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL 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: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Artem Bityutskiy Now when we use UBIFS helpers for all the I/O, we can remove the horrible hack of re-defining UBI I/O functions. Signed-off-by: Artem Bityutskiy --- fs/ubifs/debug.c | 2 -- fs/ubifs/debug.h | 7 ------- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index a159cfd..6502657 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -27,8 +27,6 @@ * various local functions of those subsystems. */ -#define UBIFS_DBG_PRESERVE_UBI - #include "ubifs.h" #include #include diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index b0b005b..b5bc09d 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -305,13 +305,6 @@ int dbg_check_inode_size(struct ubifs_info *c, const struct inode *inode, int dbg_check_data_nodes_order(struct ubifs_info *c, struct list_head *head); int dbg_check_nondata_nodes_order(struct ubifs_info *c, struct list_head *head); -#ifndef UBIFS_DBG_PRESERVE_UBI -#define ubi_leb_write dbg_leb_write -#define ubi_leb_change dbg_leb_change -#define ubi_leb_unmap dbg_leb_unmap -#define ubi_leb_map dbg_leb_map -#endif - int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, int offs, int len, int dtype); int dbg_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf,