Davies Liu: bugfix
master/mount: C++ refactor, settle with const pointers