From 48f462547d63e1d03bee612e1c77073263e71293 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 15 Oct 2021 17:58:13 +0200 Subject: homed,shutdown: call valgrind magic after LOOP_GET_STATUS64 valgrind doesn't understand LOOP_GET_STATUS64. We already work around this in various placed, via VALGRIND_MAKE_MEM_DEFINE(), but we forgot three places. Let's fix that. --- src/shutdown/umount.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/shutdown/umount.c') diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 09fc339ab1..881d4e471e 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -15,6 +15,10 @@ #include #include +#if HAVE_VALGRIND_MEMCHECK_H +#include +#endif + #include "sd-device.h" #include "alloc-util.h" @@ -409,6 +413,10 @@ static int delete_loopback(const char *device) { return -EBUSY; /* propagate original error */ } +#if HAVE_VALGRIND_MEMCHECK_H + VALGRIND_MAKE_MEM_DEFINED(&info, sizeof(info)); +#endif + if (FLAGS_SET(info.lo_flags, LO_FLAGS_AUTOCLEAR)) /* someone else already set LO_FLAGS_AUTOCLEAR for us? fine by us */ return -EBUSY; /* propagate original error */ @@ -434,6 +442,10 @@ static int delete_loopback(const char *device) { return 1; } +#if HAVE_VALGRIND_MEMCHECK_H + VALGRIND_MAKE_MEM_DEFINED(&info, sizeof(info)); +#endif + /* Linux makes LOOP_CLR_FD succeed whenever LO_FLAGS_AUTOCLEAR is set without actually doing * anything. Very confusing. Let's hence not claim we did anything in this case. */ if (FLAGS_SET(info.lo_flags, LO_FLAGS_AUTOCLEAR)) -- cgit v1.2.1