nilfs2: clean up indirect function calling conventions

This cleans up the strange indirect function calling convention used in
nilfs to follow the normal kernel coding style.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

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

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

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