From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 2 Jan 2024 20:07:40 +0000 (+0900)
Subject: storagetm: always hash stat.st_mode
X-Git-Tag: v256-rc1~1342^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c1cded77b8b0456c8793a7b3ce0ffe00a798ff;p=thirdparty%2Fsystemd.git

storagetm: always hash stat.st_mode

To make the hash function consistent with the compare function.
---

diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index b28924a8b45..c8948ec0389 100644
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -788,9 +788,10 @@ typedef struct Context {
 static void device_hash_func(const struct stat *q, struct siphash *state) {
         assert(q);
 
+        mode_t m = q->st_mode & S_IFMT;
+        siphash24_compress_typesafe(m, state);
+
         if (S_ISBLK(q->st_mode) || S_ISCHR(q->st_mode)) {
-                mode_t m = q->st_mode & S_IFMT;
-                siphash24_compress_typesafe(m, state);
                 siphash24_compress_typesafe(q->st_rdev, state);
                 return;
         }