From 891a54a153646f9b16bffe5df6cb74cb3f1e9dc6 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Fri, 3 Jun 2011 11:32:21 +0300 Subject: [PATCH] UBIFS: remove unused and unneeded debugging function This patch contains several minor clean-up and preparational cahnges. 1. Remove 'dbg_read()', 'dbg_write()', 'dbg_change()', and 'dbg_leb_erase()' functions as they are not used. 2. Remove 'dbg_leb_read()' and 'dbg_is_mapped()' as they are not really needed, it is fine to let reads go through in failure mode. 3. Rename 'offset' argument to 'offs' to be consistent with the rest of UBIFS code. Signed-off-by: Artem Bityutskiy --- fs/ubifs/debug.c | 33 ++------------------------------- fs/ubifs/debug.h | 27 +-------------------------- 2 files changed, 3 insertions(+), 57 deletions(-) diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 15bec635bf3e..059c586b5ef8 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -2718,16 +2718,8 @@ static void cut_data(const void *buf, int len) p[i] = 0xff; } -int dbg_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset, - int len, int check) -{ - if (in_failure_mode(desc)) - return -EROFS; - return ubi_leb_read(desc, lnum, buf, offset, len, check); -} - int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, - int offset, int len, int dtype) + int offs, int len, int dtype) { int err, failing; @@ -2736,7 +2728,7 @@ int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, failing = do_fail(desc, lnum, 1); if (failing) cut_data(buf, len); - err = ubi_leb_write(desc, lnum, buf, offset, len, dtype); + err = ubi_leb_write(desc, lnum, buf, offs, len, dtype); if (err) return err; if (failing) @@ -2759,20 +2751,6 @@ int dbg_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf, return 0; } -int dbg_leb_erase(struct ubi_volume_desc *desc, int lnum) -{ - int err; - - if (do_fail(desc, lnum, 0)) - return -EROFS; - err = ubi_leb_erase(desc, lnum); - if (err) - return err; - if (do_fail(desc, lnum, 0)) - return -EROFS; - return 0; -} - int dbg_leb_unmap(struct ubi_volume_desc *desc, int lnum) { int err; @@ -2787,13 +2765,6 @@ int dbg_leb_unmap(struct ubi_volume_desc *desc, int lnum) return 0; } -int dbg_is_mapped(struct ubi_volume_desc *desc, int lnum) -{ - if (in_failure_mode(desc)) - return -EROFS; - return ubi_is_mapped(desc, lnum); -} - int dbg_leb_map(struct ubi_volume_desc *desc, int lnum, int dtype) { int err; diff --git a/fs/ubifs/debug.h b/fs/ubifs/debug.h index 43ec5d120d7c..e1dcfd29c9aa 100644 --- a/fs/ubifs/debug.h +++ b/fs/ubifs/debug.h @@ -302,44 +302,19 @@ 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_read dbg_leb_read #define ubi_leb_write dbg_leb_write #define ubi_leb_change dbg_leb_change -#define ubi_leb_erase dbg_leb_erase #define ubi_leb_unmap dbg_leb_unmap -#define ubi_is_mapped dbg_is_mapped #define ubi_leb_map dbg_leb_map #endif -int dbg_leb_read(struct ubi_volume_desc *desc, int lnum, char *buf, int offset, - int len, int check); int dbg_leb_write(struct ubi_volume_desc *desc, int lnum, const void *buf, - int offset, int len, int dtype); + int offs, int len, int dtype); int dbg_leb_change(struct ubi_volume_desc *desc, int lnum, const void *buf, int len, int dtype); -int dbg_leb_erase(struct ubi_volume_desc *desc, int lnum); int dbg_leb_unmap(struct ubi_volume_desc *desc, int lnum); -int dbg_is_mapped(struct ubi_volume_desc *desc, int lnum); int dbg_leb_map(struct ubi_volume_desc *desc, int lnum, int dtype); -static inline int dbg_read(struct ubi_volume_desc *desc, int lnum, char *buf, - int offset, int len) -{ - return dbg_leb_read(desc, lnum, buf, offset, len, 0); -} - -static inline int dbg_write(struct ubi_volume_desc *desc, int lnum, - const void *buf, int offset, int len) -{ - return dbg_leb_write(desc, lnum, buf, offset, len, UBI_UNKNOWN); -} - -static inline int dbg_change(struct ubi_volume_desc *desc, int lnum, - const void *buf, int len) -{ - return dbg_leb_change(desc, lnum, buf, len, UBI_UNKNOWN); -} - /* Debugfs-related stuff */ int dbg_debugfs_init(void); void dbg_debugfs_exit(void); -- 2.39.5