nfs-server.patch - sync with upstream