summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2022-01-28 12:17:52 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2022-01-28 12:17:52 +0000
commit803adaf4883f237d0a3658fa16e72eb1c41ac828 (patch)
tree14744795b0cadc6ba75c4c636a409f059b9d93e7
parentef502aabf7d3a0d37f9c4d228f870ac93404447b (diff)
parent24231a956a4b849087fbf01173cdebb53e1bd60b (diff)
downloadlibglnx-803adaf4883f237d0a3658fa16e72eb1c41ac828.tar.gz
Merge branch 'disable_copy_file_range_on_EINVAL--I3' into 'master'
Disable copy_file_range on ecryptfs Closes #3 See merge request GNOME/libglnx!30
-rw-r--r--glnx-fdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glnx-fdio.c b/glnx-fdio.c
index 3fa73b5..fb57280 100644
--- a/glnx-fdio.c
+++ b/glnx-fdio.c
@@ -829,7 +829,7 @@ glnx_regfile_copy_bytes (int fdf, int fdt, off_t max_bytes)
have_cfr = 0;
try_cfr = false;
}
- else if (G_IN_SET (errno, EXDEV, EOPNOTSUPP))
+ else if (G_IN_SET (errno, EXDEV, EINVAL, EOPNOTSUPP))
/* We won't try cfr again for this run, but let's be
* conservative and not mark it as available/unavailable until
* we know for sure.