From fdeea3f4f1c0f78f1014582135d047265098fb82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 4 Apr 2019 10:17:16 +0200
Subject: Add fopen_unlocked() wrapper

---
 src/cryptsetup/cryptsetup-generator.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/cryptsetup/cryptsetup-generator.c')

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index e9b21689c7..fbb443c6e2 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdio_ext.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -479,15 +478,13 @@ static int add_crypttab_devices(void) {
         if (!arg_read_crypttab)
                 return 0;
 
-        f = fopen("/etc/crypttab", "re");
-        if (!f) {
+        r = fopen_unlocked("/etc/crypttab", "re", &f);
+        if (r < 0) {
                 if (errno != ENOENT)
                         log_error_errno(errno, "Failed to open /etc/crypttab: %m");
                 return 0;
         }
 
-        (void) __fsetlocking(f, FSETLOCKING_BYCALLER);
-
         if (fstat(fileno(f), &st) < 0) {
                 log_error_errno(errno, "Failed to stat /etc/crypttab: %m");
                 return 0;
-- 
cgit v1.2.1