API for 3.11

Bellow patches address API changes during the merge window. It seems Al didn't send out the readdir change... or somehow I missed it.