merge fs.c with master
removed unnecessary function