diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-15 11:37:38 +0100 |
commit | 743c5bb898be45009770c144e5e14e4f448e56b9 (patch) | |
tree | 40fff57c975f89da4a90922c165595840e99093a /drivers/md/bcache/debug.h | |
parent | 8fe120b5a665fc869c23f86e4964b801f6e53486 (diff) | |
parent | b7ae6f31d8243ec684af16bc5c763eccdfabaec0 (diff) |
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-omap
Conflicts:
sound/soc/omap/Kconfig
Diffstat (limited to 'drivers/md/bcache/debug.h')
-rw-r--r-- | drivers/md/bcache/debug.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/md/bcache/debug.h b/drivers/md/bcache/debug.h index f9378a21814..1c39b5a2489 100644 --- a/drivers/md/bcache/debug.h +++ b/drivers/md/bcache/debug.h @@ -3,15 +3,8 @@ /* Btree/bkey debug printing */ -#define KEYHACK_SIZE 80 -struct keyprint_hack { - char s[KEYHACK_SIZE]; -}; - -struct keyprint_hack bch_pkey(const struct bkey *k); -struct keyprint_hack bch_pbtree(const struct btree *b); -#define pkey(k) (&bch_pkey(k).s[0]) -#define pbtree(b) (&bch_pbtree(b).s[0]) +int bch_bkey_to_text(char *buf, size_t size, const struct bkey *k); +int bch_btree_to_text(char *buf, size_t size, const struct btree *b); #ifdef CONFIG_BCACHE_EDEBUG |