Merge "Fix typo in fs.h"