@@ -14,8 +14,15 @@
* for fast access, falling back on scanning the LPT as a last resort.
*/
-#include <linux/sort.h>
+#include <sys/types.h>
+
+#include "linux_err.h"
+#include "bitops.h"
+#include "sort.h"
#include "ubifs.h"
+#include "defs.h"
+#include "debug.h"
+#include "misc.h"
/**
* struct scan_data - data provided to scan callback functions
@@ -41,10 +41,14 @@
* good, and GC takes extra care when moving them.
*/
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/list_sort.h>
+#include "linux_err.h"
+#include "bitops.h"
+#include "kmem.h"
#include "ubifs.h"
+#include "defs.h"
+#include "debug.h"
+#include "key.h"
+#include "misc.h"
/*
* GC may need to move more than one LEB to make progress. The below constants
@@ -15,7 +15,12 @@
* debugging functions.
*/
+#include "linux_err.h"
+#include "kmem.h"
#include "ubifs.h"
+#include "defs.h"
+#include "debug.h"
+#include "key.h"
/**
* scan_padding_bytes - scan for padding bytes.
@@ -232,7 +237,7 @@ void ubifs_scanned_corruption(const struct ubifs_info *c, int lnum, int offs,
if (len > 8192)
len = 8192;
ubifs_err(c, "first %d bytes from LEB %d:%d", len, lnum, offs);
- print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1);
+ print_hex_dump("", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1);
}
/**
Adapt gc subsystem(find.c, gc.c, scan.c) in libubifs, compared with linux kernel implementations: 1. Adapt print_hex_dump based on implementations in hexdump.c. Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> --- ubifs-utils/libubifs/find.c | 9 ++++++++- ubifs-utils/libubifs/gc.c | 10 +++++++--- ubifs-utils/libubifs/scan.c | 7 ++++++- 3 files changed, 21 insertions(+), 5 deletions(-)