The patches (against Darrick's for-dave branch) fix various failures I see during testing XFS and NFS.