yaffsfs.c: Fix NULL dereference in yaffs_unmount2_reldev()

[yaffs2.git] / yportenv_single.h

diff --git a/yportenv_single.h b/yportenv_single.h
index aa7c22b59885a49dfd93014554605817ec48374e..b915433521d6bfff5aba3ed2f04e25a16c955f11 100644 (file)
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -35,6 +34,8 @@
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x
+#define YTIME_T u64
+
 
 #define YAFFS_LOSTNFOUND_NAME          "lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
@@ -49,11 +50,17 @@
 #define compile_time_assertion(assertion) \
        ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
 
+#define yaffs_printf(msk, fmt, ...) \
+       printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__)
 
+#ifdef CONFIG_YAFFS_DEBUG
 #define yaffs_trace(msk, fmt, ...) do { \
        if (yaffs_trace_mask & (msk)) \
                printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while (0)
-
+#else
+#define yaffs_trace(msk, fmt, ...) do { \
+} while (0)
+#endif
 
 #endif