Two NFSD commits for recent LTS kernels