summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-06-03 13:38:50 +0200
committerArtem Bityutskiy <dedekind1@gmail.com>2011-07-04 09:54:33 +0200
commit0a541b14e819f972d14f29d17cb9fd8b4b71222e (patch)
treeb996e3d7aeb4d05e398b805792e8d16c840edbf1
parentUBIFS: switch to I/O helpers (diff)
downloadlinux-0a541b14e819f972d14f29d17cb9fd8b4b71222e.tar.xz
linux-0a541b14e819f972d14f29d17cb9fd8b4b71222e.zip
UBIFS: stop re-defining UBI operations
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>
-rw-r--r--fs/ubifs/debug.c2
-rw-r--r--fs/ubifs/debug.h7
2 files changed, 0 insertions, 9 deletions
diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 059c586b5ef8..3a7344124f30 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 b0b005b97279..b5bc09deeb32 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,