Patchwork [27/30] UBIFS: stop re-defining UBI operations

login
register
mail settings
Submitter Artem Bityutskiy
Date June 9, 2011, 9:05 a.m.
Message ID <1307610310-28691-28-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/99704/
State New
Headers show

Comments

Artem Bityutskiy - June 9, 2011, 9:05 a.m.
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

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 <Artem.Bityutskiy@nokia.com>
---
 fs/ubifs/debug.c |    2 --
 fs/ubifs/debug.h |    7 -------
 2 files changed, 0 insertions(+), 9 deletions(-)

Patch

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 <linux/module.h>
 #include <linux/debugfs.h>
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,