summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2022-09-23 19:00:23 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2022-11-10 15:59:18 +0100
commitddfdf86f813679a3bfce7f5a50a8143d1bd720c4 (patch)
tree8386cc4182968d64c48b6da25091b0550c4073ea
parentafd8e1d94527cf663a8dc013f2190a90218666bd (diff)
downloadsystemd-ddfdf86f813679a3bfce7f5a50a8143d1bd720c4.tar.gz
stat-util: Move inode_hash_ops to stat-util
TO make it usable in other code.
-rw-r--r--src/basic/stat-util.c18
-rw-r--r--src/basic/stat-util.h5
-rw-r--r--src/shared/bootspec.c18
3 files changed, 24 insertions, 17 deletions
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c
index 51adaca9d0..97dbcaac66 100644
--- a/src/basic/stat-util.c
+++ b/src/basic/stat-util.c
@@ -15,6 +15,7 @@
#include "fileio.h"
#include "filesystems.h"
#include "fs-util.h"
+#include "hash-funcs.h"
#include "macro.h"
#include "missing_fs.h"
#include "missing_magic.h"
@@ -441,3 +442,20 @@ int statx_fallback(int dfd, const char *path, int flags, unsigned mask, struct s
return 0;
}
+
+void inode_hash_func(const struct stat *q, struct siphash *state) {
+ siphash24_compress(&q->st_dev, sizeof(q->st_dev), state);
+ siphash24_compress(&q->st_ino, sizeof(q->st_ino), state);
+}
+
+int inode_compare_func(const struct stat *a, const struct stat *b) {
+ int r;
+
+ r = CMP(a->st_dev, b->st_dev);
+ if (r != 0)
+ return r;
+
+ return CMP(a->st_ino, b->st_ino);
+}
+
+DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR(inode_hash_ops, struct stat, inode_hash_func, inode_compare_func, free);
diff --git a/src/basic/stat-util.h b/src/basic/stat-util.h
index f9519d8cbd..de11c0cf7c 100644
--- a/src/basic/stat-util.h
+++ b/src/basic/stat-util.h
@@ -11,6 +11,7 @@
#include "macro.h"
#include "missing_stat.h"
+#include "siphash24.h"
int is_symlink(const char *path);
int is_dir_full(int atfd, const char *fname, bool follow);
@@ -96,3 +97,7 @@ int statx_fallback(int dfd, const char *path, int flags, unsigned mask, struct s
struct new_statx nsx; \
} var
#endif
+
+void inode_hash_func(const struct stat *q, struct siphash *state);
+int inode_compare_func(const struct stat *a, const struct stat *b);
+extern const struct hash_ops inode_hash_ops;
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 6a34b10c04..c3015487c5 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -19,6 +19,7 @@
#include "pretty-print.h"
#include "recurse-dir.h"
#include "sort-util.h"
+#include "stat-util.h"
#include "string-table.h"
#include "strv.h"
#include "terminal-util.h"
@@ -543,23 +544,6 @@ static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {
return -strverscmp_improved(a->id, b->id);
}
-static void inode_hash_func(const struct stat *q, struct siphash *state) {
- siphash24_compress(&q->st_dev, sizeof(q->st_dev), state);
- siphash24_compress(&q->st_ino, sizeof(q->st_ino), state);
-}
-
-static int inode_compare_func(const struct stat *a, const struct stat *b) {
- int r;
-
- r = CMP(a->st_dev, b->st_dev);
- if (r != 0)
- return r;
-
- return CMP(a->st_ino, b->st_ino);
-}
-
-DEFINE_HASH_OPS_WITH_KEY_DESTRUCTOR(inode_hash_ops, struct stat, inode_hash_func, inode_compare_func, free);
-
static int config_check_inode_relevant_and_unseen(BootConfig *config, int fd, const char *fname) {
_cleanup_free_ char *d = NULL;
struct stat st;