Merge "Close fd on error path in do_mount()"