Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

* 'linux-next' of git://git.infradead.org/ubifs-2.6:
  UBIFS: fix the dark space calculation
  UBIFS: introduce a helper to dump scanning info

diff --combined fs/ubifs/debug.h
index feb361e252acfe801d186849430c553e39a4268e,2bf84211e320d4897075fd7f1c80c2b7776e952a..8d9c46810189a1db050d047a11b521c8fe145dba
--- 1/fs/ubifs/debug.h
--- 2/fs/ubifs/debug.h
+++ b/fs/ubifs/debug.h
@@@ -269,6 -269,8 +269,8 @@@ void dbg_dump_lprop(const struct ubifs_
  void dbg_dump_lprops(struct ubifs_info *c);
  void dbg_dump_lpt_info(struct ubifs_info *c);
  void dbg_dump_leb(const struct ubifs_info *c, int lnum);
+ void dbg_dump_sleb(const struct ubifs_info *c,
+                  const struct ubifs_scan_leb *sleb, int offs);
  void dbg_dump_znode(const struct ubifs_info *c,
                    const struct ubifs_znode *znode);
  void dbg_dump_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat);
@@@ -335,9 -337,9 +337,9 @@@ void dbg_debugfs_exit_fs(struct ubifs_i
  #define DBGKEY(key)  ((char *)(key))
  #define DBGKEY1(key) ((char *)(key))
  
 -#define ubifs_dbg_msg(fmt, ...) do {               \
 -      if (0)                                     \
 -              pr_debug(fmt "\n", ##__VA_ARGS__); \
 +#define ubifs_dbg_msg(fmt, ...) do {                        \
 +      if (0)                                              \
 +              printk(KERN_DEBUG fmt "\n", ##__VA_ARGS__); \
  } while (0)
  
  #define dbg_dump_stack()
@@@ -387,6 -389,9 +389,9 @@@ static inline void dbg_dump_lpt_info(st
  static inline void dbg_dump_leb(const struct ubifs_info *c,
                                int lnum)                         { return; }
  static inline void
+ dbg_dump_sleb(const struct ubifs_info *c,
+             const struct ubifs_scan_leb *sleb, int offs)        { return; }
+ static inline void
  dbg_dump_znode(const struct ubifs_info *c,
               const struct ubifs_znode *znode)                   { return; }
  static inline void dbg_dump_heap(struct ubifs_info *c,