Merge of master-melb:xfs-cmds:27522a by kenmcd. Test that the on-disk file size is correct if file has been truncated.
Merge of master-melb:xfs-cmds:27179a by kenmcd.