This series cleans up block mapping code. The "nilfs2: get rid of private conversion macros on bmap key and pointer" unfolds some conversion macros for simplicity. Other changes are for unifying four similar structures and union around the block mapping layer, i.e nilfs_bmap, nilfs_btree, nilfs_direct, and nilfs_bmap_union. These patches allow removal of nilfs_bmap_union.h file and eliminate pointer casts among these structures. Ryusuke Konishi -- Ryusuke Konishi (6): nilfs2: get rid of private conversion macros on bmap key and pointer nilfs2: remove constant qualifier from argument of bmap propagate nilfs2: get rid of nilfs_direct uses nilfs2: get rid of nilfs_btree uses nilfs2: unify bmap set_target_v operations nilfs2: get rid of nilfs_bmap_union fs/nilfs2/bmap.c | 6 +- fs/nilfs2/bmap.h | 14 +- fs/nilfs2/bmap_union.h | 42 ------ fs/nilfs2/btree.c | 355 +++++++++++++++++++++--------------------------- fs/nilfs2/btree.h | 10 +-- fs/nilfs2/direct.c | 93 +++++-------- fs/nilfs2/direct.h | 11 -- fs/nilfs2/gcinode.c | 2 + fs/nilfs2/mdt.c | 1 + fs/nilfs2/nilfs.h | 7 +- fs/nilfs2/super.c | 4 +- 11 files changed, 212 insertions(+), 333 deletions(-) delete mode 100644 fs/nilfs2/bmap_union.h -- To unsubscribe from this list: send the line "unsubscribe linux-nilfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html