Merge branch 'master' of https://github.com/timemath/hmfs

Conflicts:
	fs/hmfs/Makefile

Author: wulinzhu

fs/hmfs/Makefile

@@ -8,6 +8,7 @@ ccflags-y += -DCONFIG_HMFS_DEBUG_RW_LOCK
 obj-m += hmfs.o
 
 hmfs-objs := super.o node.o inode.o checkpoint.o file.o data.o namei.o segment.o hash.o dir.o symlink.o gc.o recovery.o
+
 hmfs-objs += debug.o
 hmfs-objs += xattr.o
 hmfs-objs += util.o