fs/sync: properly backport