resubmit
Merge branch 'master' of https://github.com/bfeng/FusionFS-Cache

Conflicts:
	test/.test.c.swp
	test/test.c