reread-partition-table: fix typo

Follow-up for 34c3d574742e867ef97e79509e4051a82f1b7d9b

Also, drop pointless shortcut.

src/basic/mkdir.c

@@ -255,8 +255,8 @@ int mkdir_p_root_full(const char *root, const char *p, uid_t uid, gid_t gid, mod
         if (nfd < 0)
                 return nfd;
 
-        if (ts == USEC_INFINITY && !uid_is_valid(uid) && !gid_is_valid(gid))
+        if ((uid_is_valid(uid) || gid_is_valid(gid)) && fchown(nfd, uid, gid) < 0)
-                return 1;
+                return -errno;
 
         if (ts != USEC_INFINITY) {
                 struct timespec tspec;
@@ -269,8 +269,5 @@ int mkdir_p_root_full(const char *root, const char *p, uid_t uid, gid_t gid, mod
                         return -errno;
         }
 
-        if ((uid_is_valid(uid) || gid_is_valid(gid)) && fchown(nfd, uid, gid) < 0)
-                return -errno;
-
         return 1;
 }

src/shared/prompt-util.c

@@ -2,7 +2,7 @@
 
 #include <unistd.h>
 
-#include <sd-varlink.h>
+#include "sd-varlink.h"
 
 #include "alloc-util.h"
 #include "glyph-util.h"

src/shared/prompt-util.h

@@ -1,8 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stdbool.h>
-
 #include "shared-forward.h"
 
 typedef enum PromptFlags {

src/shared/reread-partition-table.h

@@ -6,7 +6,7 @@
 #include "shared-forward.h"
 
 typedef enum RereadPartitionTableFlags {
-        REREADPT_FORCE_UEVENT = 1 << 0, /* Force a "change" ueven out on partitions we didn't resize/remove/add */
+        REREADPT_FORCE_UEVENT = 1 << 0, /* Force a "change" uevent out on partitions we didn't resize/remove/add */
         REREADPT_BSD_LOCK     = 1 << 1, /* Take a BSD lock on the device around the rescan operation */
 } RereadPartitionTableFlags;