summaryrefslogtreecommitdiff
path: root/src/libotutil/ot-fs-utils.h
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2017-10-04 15:06:31 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2017-10-04 20:42:39 +0000
commit5c7d2dd8be3606d9aec1e6835086f6b4dfcdb6a7 (patch)
treef796da733316a3dc1b36779d889140a624ed50df /src/libotutil/ot-fs-utils.h
parentc511ca0fae0e352d52bb7d1a24b4c1d08c5a8ec9 (diff)
downloadostree-5c7d2dd8be3606d9aec1e6835086f6b4dfcdb6a7.tar.gz
Deduplicate and fix up our use of mmap()
Buried in this large patch is a logical fix: ``` - if (!map) - return glnx_throw_errno_prefix (error, "mmap"); + if (map == (void*)-1) + return glnx_null_throw_errno_prefix (error, "mmap"); ``` Which would have helped me debug another patch I was working on. But it turns out that actually correctly checking for errors from `mmap()` triggers lots of other bugs - basically because we sometimes handle zero-length variants (in detached metadata). When we start actually returning errors due to this, things break. (It wasn't a problem in practice before because most things looked at the zero size, not the data). Anyways there's a bigger picture issue here - a while ago we made a fix to only use `mmap()` for reading metadata from disk only if it was large enough (i.e. `>16k`). But that didn't help various other paths in the pull code and others that were directly doing the `mmap()`. Fix this by having a proper low level fs helper that does "read all data from fd+offset into GBytes", which handles the size check. Then the `GVariant` bits are just a clean layer on top of this. (At the small cost of an additional allocation) Side note: I had to remind myself, but the reason we can't just use `GMappedFile` here is it doesn't support passing an offset into `mmap()`. Closes: #1251 Approved by: jlebon
Diffstat (limited to 'src/libotutil/ot-fs-utils.h')
-rw-r--r--src/libotutil/ot-fs-utils.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libotutil/ot-fs-utils.h b/src/libotutil/ot-fs-utils.h
index 98fcd6a2..7eb811cd 100644
--- a/src/libotutil/ot-fs-utils.h
+++ b/src/libotutil/ot-fs-utils.h
@@ -85,8 +85,7 @@ ot_map_anonymous_tmpfile_from_content (GInputStream *instream,
GCancellable *cancellable,
GError **error);
-GBytes *ot_file_mapat_bytes (int dfd,
- const char *path,
- GError **error);
+GBytes *ot_fd_readall_or_mmap (int fd, goffset offset,
+ GError **error);
G_END_DECLS