nilfs2: get rid of private conversion macros on bmap key and pointer

Will remove nilfs_bmap_key_to_dkey(), nilfs_bmap_dkey_to_key(),
nilfs_bmap_ptr_to_dptr(), and nilfs_bmap_dptr_to_ptr() for simplicity.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>

diff --cc fs/nilfs2/bmap.h
Simple merge

diff --cc fs/nilfs2/btree.c
Simple merge

diff --cc fs/nilfs2/direct.c
Simple merge