Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

diff --combined direct/ydirectenv.h
index 3c6ddf566a8b3d713bc0019c19d37e5e933ab4d1,7063fa649fb25b4e0329ae9ff43925d45bc0d86b..ad4efab710e036d3904a256c0e43add08c9d46cc
--- 1/direct/ydirectenv.h
--- 2/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@@ -53,15 -53,15 +53,15 @@@ void yaffs_qsort(void *aa, size_t n, si
  #define inline __inline__
  #endif
  
 -#define kmalloc(x,flags) yaffs_malloc(x)
 -#define kfree(x)   yaffs_free(x)
 -#define vmalloc(x) yaffs_malloc(x)
 -#define vfree(x) yaffs_free(x)
 +#define kmalloc(x,flags) yaffsfs_malloc(x)
 +#define kfree(x)   yaffsfs_free(x)
 +#define vmalloc(x) yaffsfs_malloc(x)
 +#define vfree(x) yaffsfs_free(x)
  
  #define cond_resched()  do {} while(0)
  
  #define yaffs_trace(msk, fmt, ...) do { \
-       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+       if(yaffs_trace_mask & (msk)) \
                printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
  } while(0)