diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c
index b9223217..26e72c45 100644
--- a/src/libostree/ostree-fetcher.c
+++ b/src/libostree/ostree-fetcher.c
@@ -406,7 +406,7 @@ session_thread_request_uri (ThreadClosure *thread_closure,
             exists = FALSE;
           else
             {
-              gs_set_error_from_errno (&local_error, errno);
+              glnx_set_error_from_errno (&local_error);
               g_task_return_error (task, local_error);
               return;
             }
@@ -706,7 +706,7 @@ finish_stream (OstreeFetcherPendingURI *pending,
                pending->out_tmpfile,
                &stbuf, AT_SYMLINK_NOFOLLOW) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -922,7 +922,7 @@ on_request_sent (GObject        *object,
                    pending->out_tmpfile, oflags, 0666);
       if (fd == -1)
         {
-          gs_set_error_from_errno (&local_error, errno);
+          glnx_set_error_from_errno (&local_error);
           goto out;
         }
       pending->out_stream = g_unix_output_stream_new (fd, TRUE);
diff --git a/src/libostree/ostree-repo-checkout.c b/src/libostree/ostree-repo-checkout.c
index ea70fd36..d6ad494b 100644
--- a/src/libostree/ostree-repo-checkout.c
+++ b/src/libostree/ostree-repo-checkout.c
@@ -73,7 +73,7 @@ checkout_object_for_uncompressed_cache (OstreeRepo      *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -91,7 +91,7 @@ checkout_object_for_uncompressed_cache (OstreeRepo      *self,
     {
       if (errno != EEXIST)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           g_prefix_error (error, "Storing file '%s': ", temp_filename);
           goto out;
         }
@@ -144,7 +144,7 @@ write_regular_file_content (OstreeRepo            *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -153,7 +153,7 @@ write_regular_file_content (OstreeRepo            *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
               
@@ -168,7 +168,7 @@ write_regular_file_content (OstreeRepo            *self,
     {
       if (fsync (fd) == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -203,7 +203,7 @@ checkout_file_from_input_at (OstreeRepo     *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (res == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -214,7 +214,7 @@ checkout_file_from_input_at (OstreeRepo     *self,
                                     g_file_info_get_attribute_uint32 (file_info, "unix::gid"),
                                     AT_SYMLINK_NOFOLLOW) == -1))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
 
@@ -242,7 +242,7 @@ checkout_file_from_input_at (OstreeRepo     *self,
       while (G_UNLIKELY (fd == -1 && errno == EINTR));
       if (fd == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
       temp_out = g_unix_output_stream_new (fd, TRUE);
@@ -318,7 +318,7 @@ checkout_file_unioning_from_input_at (OstreeRepo     *repo,
   if (G_UNLIKELY (renameat (destination_dfd, temp_filename,
                             destination_dfd, destination_name) == -1))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -373,7 +373,7 @@ checkout_file_hardlink (OstreeRepo                          *self,
   else
     {
       g_prefix_error (error, "Hardlinking %s to %s: ", loose_path, destination_name);
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -650,7 +650,7 @@ checkout_tree_at (OstreeRepo                        *self,
         did_exist = TRUE;
       else
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -734,7 +734,7 @@ checkout_tree_at (OstreeRepo                        *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -748,7 +748,7 @@ checkout_tree_at (OstreeRepo                        *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -764,7 +764,7 @@ checkout_tree_at (OstreeRepo                        *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (G_UNLIKELY (res == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -773,7 +773,7 @@ checkout_tree_at (OstreeRepo                        *self,
     {
       if (fsync (destination_dfd) == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 083c0265..c0810a66 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -65,10 +65,9 @@ _ostree_repo_ensure_loose_objdir_at (int             dfd,
   loose_prefix[2] = '\0';
   if (mkdirat (dfd, loose_prefix, 0777) == -1)
     {
-      int errsv = errno;
-      if (G_UNLIKELY (errsv != EEXIST))
+      if (G_UNLIKELY (errno != EEXIST))
         {
-          gs_set_error_from_errno (error, errsv);
+          glnx_set_error_from_errno (error);
           return FALSE;
         }
     }
@@ -118,7 +117,7 @@ write_file_metadata_to_xattr (int fd,
   while (G_UNLIKELY (res == -1 && errno == EINTR));
   if (G_UNLIKELY (res == -1))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       g_prefix_error (error, "Unable to set xattr: ");
       return FALSE;
     }
@@ -155,7 +154,7 @@ _ostree_repo_commit_loose_final (OstreeRepo        *self,
     {
       if (errno != EEXIST)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           g_prefix_error (error, "Storing file '%s': ", temp_filename);
           goto out;
         }
@@ -195,7 +194,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
                                 self->target_owner_gid,
                                 AT_SYMLINK_NOFOLLOW) == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -213,7 +212,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
                                 uid, gid,
                                 AT_SYMLINK_NOFOLLOW) == -1))
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -236,7 +235,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
           while (G_UNLIKELY (res == -1 && errno == EINTR));
           if (G_UNLIKELY (res == -1))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
 
@@ -245,7 +244,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
           while (G_UNLIKELY (res == -1 && errno == EINTR));
           if (G_UNLIKELY (res == -1))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
 
@@ -272,7 +271,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
               while (G_UNLIKELY (res == -1 && errno == EINTR));
               if (G_UNLIKELY (res == -1))
                 {
-                  gs_set_error_from_errno (error, errno);
+                  glnx_set_error_from_errno (error);
                   goto out;
                 }
             }
@@ -294,7 +293,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
           while (G_UNLIKELY (res == -1 && errno == EINTR));
           if (G_UNLIKELY (res == -1))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -306,7 +305,7 @@ commit_loose_object_trusted (OstreeRepo        *self,
         {
           if (fsync (fd) == -1)
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -453,7 +452,9 @@ fallocate_stream (GFileDescriptorBased      *stream,
       int r = posix_fallocate (fd, 0, size);
       if (r != 0)
         {
-          gs_set_error_from_errno (error, r);
+          /* posix_fallocate is a weird deviation from errno standards */
+          errno = r;
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -511,7 +512,7 @@ _ostree_repo_commit_untrusted_content_bare (OstreeRepo          *self,
       fd = openat (self->tmp_dir_fd, state->temp_filename, O_RDONLY);
       if (fd == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -844,7 +845,7 @@ write_object (OstreeRepo         *self,
 
       if (fstatat (self->tmp_dir_fd, temp_filename, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -1225,7 +1226,7 @@ rename_pending_loose_objects (OstreeRepo        *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (res == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -1265,7 +1266,7 @@ rename_pending_loose_objects (OstreeRepo        *self,
           if (G_UNLIKELY (renameat (child_dfd_iter.fd, loose_objpath + 3,
                                     self->objects_dir_fd, loose_objpath) < 0))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -1449,7 +1450,7 @@ ostree_repo_commit_transaction (OstreeRepo                  *self,
 
   if (syncfs (self->tmp_dir_fd) < 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -2689,7 +2690,7 @@ write_dfd_iter_to_mtree_internal (OstreeRepo                  *self,
 
   if (fstat (src_dfd_iter->fd, &dir_stbuf) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -2745,7 +2746,7 @@ write_dfd_iter_to_mtree_internal (OstreeRepo                  *self,
 
       if (fstatat (src_dfd_iter->fd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
index ad4753ad..d27b15ea 100644
--- a/src/libostree/ostree-repo-pull.c
+++ b/src/libostree/ostree-repo-pull.c
@@ -841,7 +841,7 @@ meta_fetch_on_complete (GObject           *object,
   fd = openat (_ostree_fetcher_get_dfd (fetcher), temp_path, O_RDONLY | O_CLOEXEC);
   if (fd == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
diff --git a/src/libostree/ostree-repo-static-delta-compilation.c b/src/libostree/ostree-repo-static-delta-compilation.c
index 301ef99d..df5dc19e 100644
--- a/src/libostree/ostree-repo-static-delta-compilation.c
+++ b/src/libostree/ostree-repo-static-delta-compilation.c
@@ -465,7 +465,7 @@ get_unpacked_unlinked_content (OstreeRepo       *repo,
   fd = g_mkstemp (tmpname);
   if (fd == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
   /* Doesn't need a name */
diff --git a/src/libostree/ostree-repo-static-delta-processing.c b/src/libostree/ostree-repo-static-delta-processing.c
index b44314b6..6c5dd463 100644
--- a/src/libostree/ostree-repo-static-delta-processing.c
+++ b/src/libostree/ostree-repo-static-delta-processing.c
@@ -754,7 +754,7 @@ dispatch_write (OstreeRepo                 *repo,
         {
           if (lseek (state->read_source_fd, content_offset, SEEK_SET) == -1)
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
           while (content_size > 0)
@@ -767,7 +767,7 @@ dispatch_write (OstreeRepo                 *repo,
               while (G_UNLIKELY (bytes_read == -1 && errno == EINTR));
               if (bytes_read == -1)
                 {
-                  gs_set_error_from_errno (error, errno);
+                  glnx_set_error_from_errno (error);
                   goto out;
                 }
               if (G_UNLIKELY (bytes_read == 0))
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 2a0a2bc8..41377e76 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2288,12 +2288,12 @@ ostree_repo_open (OstreeRepo    *self,
   if (!self->writable)
     {
       /* This is returned through ostree_repo_is_writable(). */
-      gs_set_error_from_errno (&self->writable_error, errno);
+      glnx_set_error_from_errno (&self->writable_error);
     }
 
   if (fstat (self->objects_dir_fd, &stbuf) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -2525,7 +2525,7 @@ list_loose_objects_at (OstreeRepo             *self,
   d = fdopendir (dfd);
   if (!d)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -2619,7 +2619,7 @@ list_loose_objects (OstreeRepo                     *self,
             continue;
           else
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -2750,7 +2750,7 @@ query_info_for_bare_content_object (OstreeRepo      *self,
           ret = TRUE;
           goto out;
         }
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -3100,7 +3100,7 @@ _ostree_repo_has_loose_object (OstreeRepo           *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (res == -1 && errno != ENOENT)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -3114,7 +3114,7 @@ _ostree_repo_has_loose_object (OstreeRepo           *self,
       while (G_UNLIKELY (res == -1 && errno == EINTR));
       if (res == -1 && errno != ENOENT)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -3232,7 +3232,7 @@ ostree_repo_delete_object (OstreeRepo           *self,
         {
           if (G_UNLIKELY (errno != ENOENT))
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -3243,7 +3243,7 @@ ostree_repo_delete_object (OstreeRepo           *self,
   while (G_UNLIKELY (res == -1 && errno == EINTR));
   if (G_UNLIKELY (res == -1))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -3379,7 +3379,7 @@ import_one_object_link (OstreeRepo    *self,
           ret = TRUE;
         }
       else
-        gs_set_error_from_errno (error, errno);
+        glnx_set_error_from_errno (error);
       
       goto out;
     }
@@ -3483,7 +3483,7 @@ ostree_repo_query_object_storage_size (OstreeRepo           *self,
   while (G_UNLIKELY (res == -1 && errno == EINTR));
   if (G_UNLIKELY (res == -1))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -4651,7 +4651,7 @@ ostree_repo_regenerate_summary (OstreeRepo     *self,
         superblock_file_fd = openat (self->repo_dir_fd, superblock, O_RDONLY | O_CLOEXEC);
         if (superblock_file_fd == -1)
           {
-            gs_set_error_from_errno (error, errno);
+            glnx_set_error_from_errno (error);
             goto out;
           }
 
@@ -4694,7 +4694,7 @@ ostree_repo_regenerate_summary (OstreeRepo     *self,
     {
       if (errno != ENOENT)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
diff --git a/src/libostree/ostree-sepolicy.c b/src/libostree/ostree-sepolicy.c
index 5580ac94..b8e3572d 100644
--- a/src/libostree/ostree-sepolicy.c
+++ b/src/libostree/ostree-sepolicy.c
@@ -347,10 +347,9 @@ ostree_sepolicy_get_label (OstreeSePolicy    *self,
       res = selabel_lookup_raw (self->selinux_hnd, &con, relpath, unix_mode);
       if (res != 0)
         {
-          int errsv = errno;
-          if (errsv != ENOENT)
+          if (errno != ENOENT)
             {
-              gs_set_error_from_errno (error, errsv);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -443,7 +442,7 @@ ostree_sepolicy_restorecon (OstreeSePolicy    *self,
           int res = lsetfilecon (gs_file_get_path_cached (target), label);
           if (res != 0)
             {
-              gs_set_error_from_errno (error, errno);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }
@@ -491,7 +490,7 @@ ostree_sepolicy_setfscreatecon (OstreeSePolicy   *self,
 
   if (setfscreatecon_raw (label) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       return FALSE;
     }
 
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
index bbea3c05..659a7bed 100644
--- a/src/libostree/ostree-sysroot-deploy.c
+++ b/src/libostree/ostree-sysroot-deploy.c
@@ -112,17 +112,17 @@ dirfd_copy_attributes_and_xattrs (int            src_parent_dfd,
 
   if (fstat (src_dfd, &src_stbuf) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
   if (fchown (dest_dfd, src_stbuf.st_uid, src_stbuf.st_gid) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
   if (fchmod (dest_dfd, src_stbuf.st_mode) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -150,7 +150,7 @@ copy_dir_recurse (int              src_parent_dfd,
   /* Create with mode 0700, we'll fchmod/fchown later */
   if (mkdirat (dest_parent_dfd, name, 0700) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -164,7 +164,7 @@ copy_dir_recurse (int              src_parent_dfd,
   srcd = fdopendir (src_dfd);
   if (!srcd)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -180,7 +180,7 @@ copy_dir_recurse (int              src_parent_dfd,
       if (fstatat (src_dfd, name, &child_stbuf,
                    AT_SYMLINK_NOFOLLOW) != 0)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
 
@@ -262,7 +262,7 @@ ensure_directory_from_template (int                 orig_etc_fd,
         }
       else
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           g_prefix_error (error, "mkdirat: ");
           goto out;
         }
@@ -312,7 +312,7 @@ copy_modified_config_file (int                 orig_etc_fd,
 
   if (fstatat (modified_etc_fd, path, &modified_stbuf, AT_SYMLINK_NOFOLLOW) < 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       g_prefix_error (error, "Failed to read modified config file '%s': ", path);
       goto out;
     }
@@ -330,7 +330,7 @@ copy_modified_config_file (int                 orig_etc_fd,
       dest_parent_dfd = dup (new_etc_fd);
       if (dest_parent_dfd == -1)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -343,7 +343,7 @@ copy_modified_config_file (int                 orig_etc_fd,
         ;
       else
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -369,7 +369,7 @@ copy_modified_config_file (int                 orig_etc_fd,
     {
       if (unlinkat (new_etc_fd, path, 0) < 0)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -1367,7 +1367,7 @@ install_deployment_kernel (OstreeSysroot   *sysroot,
     {
       if (errno != ENOENT)
         {
-          gs_set_error_from_errno (error, errno);
+          glnx_set_error_from_errno (error);
           goto out;
         }
       else
diff --git a/src/libotutil/ot-fs-utils.c b/src/libotutil/ot-fs-utils.c
index ec27d762..4d45cd06 100644
--- a/src/libotutil/ot-fs-utils.c
+++ b/src/libotutil/ot-fs-utils.c
@@ -45,7 +45,7 @@ ot_gopendirat (int             dfd,
   int ret = ot_opendirat (dfd, path, follow);
   if (ret == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       return FALSE;
     }
   *out_fd = ret;
@@ -71,7 +71,7 @@ ot_lgetxattrat (int            dfd,
   while (G_UNLIKELY (bytes_read < 0 && errno == EINTR));
   if (G_UNLIKELY (bytes_read < 0))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -81,7 +81,7 @@ ot_lgetxattrat (int            dfd,
   while (G_UNLIKELY (real_size < 0 && errno == EINTR));
   if (G_UNLIKELY (real_size < 0))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       g_free (buf);
       goto out;
     }
@@ -111,7 +111,7 @@ ot_lsetxattrat (int            dfd,
   while (G_UNLIKELY (res == -1 && errno == EINTR));
   if (G_UNLIKELY (res == -1))
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       return FALSE;
     }
 
@@ -134,7 +134,7 @@ ot_readlinkat_gfile_info (int             dfd,
   while (G_UNLIKELY (len == -1 && errno == EINTR));
   if (len == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
   targetbuf[len] = '\0';
@@ -180,7 +180,7 @@ ot_openat_read_stream (int             dfd,
   while (G_UNLIKELY (fd == -1 && errno == EINTR));
   if (fd == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
diff --git a/src/libotutil/ot-gio-utils.c b/src/libotutil/ot-gio-utils.c
index b10c04c5..f750e75b 100644
--- a/src/libotutil/ot-gio-utils.c
+++ b/src/libotutil/ot-gio-utils.c
@@ -309,7 +309,9 @@ ot_file_replace_contents_at (int             dfd,
       int r = posix_fallocate (fd, 0, g_bytes_get_size (contents));
       if (r != 0)
         {
-          gs_set_error_from_errno (error, r);
+          /* posix_fallocate is a weird deviation from errno standards */
+          errno = r;
+          glnx_set_error_from_errno (error);
           goto out;
         }
     }
@@ -320,7 +322,7 @@ ot_file_replace_contents_at (int             dfd,
 
   if (datasync && fdatasync (fd) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -329,7 +331,7 @@ ot_file_replace_contents_at (int             dfd,
 
   if (renameat (dfd, tmpname, dfd, path) == -1)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -429,7 +431,7 @@ ot_util_fsync_directory (GFile         *dir,
 
   if (fsync (dfd) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
diff --git a/src/libotutil/ot-variant-utils.c b/src/libotutil/ot-variant-utils.c
index ed650268..0305c34d 100644
--- a/src/libotutil/ot-variant-utils.c
+++ b/src/libotutil/ot-variant-utils.c
@@ -204,7 +204,7 @@ ot_util_variant_map_fd (int                    fd,
 
   if (fstat (fd, &stbuf) != 0)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
@@ -212,7 +212,7 @@ ot_util_variant_map_fd (int                    fd,
   map = mmap (NULL, len, PROT_READ, MAP_PRIVATE, fd, start);
   if (!map)
     {
-      gs_set_error_from_errno (error, errno);
+      glnx_set_error_from_errno (error);
       goto out;
     }
 
diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index b5fb5d0f..038559bb 100644
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -427,10 +427,9 @@ ostree_builtin_trivial_httpd (int argc, char **argv, GCancellable *cancellable,
        */
       if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
         {
-          int errsv = errno;
-          if (errsv != ENOSYS)
+          if (errno != ENOSYS)
             {
-              gs_set_error_from_errno (error, errsv);
+              glnx_set_error_from_errno (error);
               goto out;
             }
         }