fix mismerge with Trond's stuff (create_mnt_ns() export is gone now)