tree-wide: Bump libglnx, port to new lockfile init

In particular I'd like to get the copy fix in, since it might affect users for
the keyring bits.

Update submodule: libglnx

Closes: #1225
Approved by: jlebon

diff --git a/libglnx b/libglnx
index e5856ca2939dca0589a836e3108dd3f9759e28fa..e30154431d7eea6397e5502b175ba3b50330140f 160000 (submodule)
--- a/libglnx
+++ b/libglnx
@@ -1 +1 @@
-Subproject commit e5856ca2939dca0589a836e3108dd3f9759e28fa
+Subproject commit e30154431d7eea6397e5502b175ba3b50330140f

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index df5c92cd1921f0a573ed3f2bc98239283a961ab6..1b7d380cf0ad2bd179f1f6ae3e05d7b209587a41 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1234,7 +1234,7 @@ cleanup_tmpdir (OstreeRepo        *self,
       guint64 delta;
       struct dirent *dent;
       struct stat stbuf;
-      g_auto(GLnxLockFile) lockfile = GLNX_LOCK_FILE_INIT;
+      g_auto(GLnxLockFile) lockfile = { 0, };
       gboolean did_lock;
 
       if (!glnx_dirfd_iterator_next_dent (&dfd_iter, &dent, cancellable, error))

diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index e02ea87aeeab2de2f9e1d4a898b7879188fb3244..1e336e9098530b5a7389a89848d7780f4a511175 100644 (file)
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -662,7 +662,6 @@ static void
 ostree_repo_init (OstreeRepo *self)
 {
   static gsize gpgme_initialized;
-  GLnxLockFile empty_lockfile = GLNX_LOCK_FILE_INIT;
   const GDebugKey test_error_keys[] = {
     { "pre-commit", OSTREE_REPO_TEST_ERROR_PRE_COMMIT },
   };
@@ -690,7 +689,6 @@ ostree_repo_init (OstreeRepo *self)
   self->tmp_dir_fd = -1;
   self->objects_dir_fd = -1;
   self->uncompressed_objects_dir_fd = -1;
-  self->commit_stagedir_lock = empty_lockfile;
   self->sysroot_kind = OSTREE_REPO_SYSROOT_KIND_UNKNOWN;
 }
 

diff --git a/src/libostree/ostree-sysroot.c b/src/libostree/ostree-sysroot.c
index c70545716d5a93ffba7226a377824ec9580aeb06..fe61a12e3013884c30d99613d9668f644a102a93 100644 (file)
--- a/src/libostree/ostree-sysroot.c
+++ b/src/libostree/ostree-sysroot.c
@@ -197,7 +197,6 @@ ostree_sysroot_init (OstreeSysroot *self)
                                             keys, G_N_ELEMENTS (keys));
 
   self->sysroot_fd = -1;
-  self->lock = (GLnxLockFile)GLNX_LOCK_FILE_INIT;
 }
 
 /**