From: Mike Yuan <me@yhndnzj.com>
Date: Tue, 14 May 2024 13:28:33 +0000 (+0800)
Subject: core/exec-credential: drop unused unit_add_default_credential_dependencies
X-Git-Tag: v257-rc1~1186^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1899715826c1617bd945b759e865a9f1b8a2db5b;p=thirdparty%2Fsystemd.git

core/exec-credential: drop unused unit_add_default_credential_dependencies
---

diff --git a/src/core/exec-credential.c b/src/core/exec-credential.c
index d58aa18b556..e46a76f0ac9 100644
--- a/src/core/exec-credential.c
+++ b/src/core/exec-credential.c
@@ -119,31 +119,6 @@ int exec_context_get_credential_directory(
         return get_credential_directory(params->prefix[EXEC_DIRECTORY_RUNTIME], unit, ret);
 }
 
-int unit_add_default_credential_dependencies(Unit *u, const ExecContext *c) {
-        _cleanup_free_ char *p = NULL, *m = NULL;
-        int r;
-
-        assert(u);
-        assert(c);
-
-        if (!exec_context_has_credentials(c))
-                return 0;
-
-        /* Let's make sure the credentials directory of this service is unmounted *after* the service itself
-         * shuts down. This only matters if mount namespacing is not used for the service, and hence the
-         * credentials mount appears on the host. */
-
-        r = get_credential_directory(u->manager->prefix[EXEC_DIRECTORY_RUNTIME], u->id, &p);
-        if (r <= 0)
-                return r;
-
-        r = unit_name_from_path(p, ".mount", &m);
-        if (r < 0)
-                return r;
-
-        return unit_add_dependency_by_name(u, UNIT_AFTER, m, /* add_reference= */ true, UNIT_DEPENDENCY_FILE);
-}
-
 int exec_context_destroy_credentials(const ExecContext *c, const char *runtime_prefix, const char *unit) {
         _cleanup_free_ char *p = NULL;
         int r;
diff --git a/src/core/exec-credential.h b/src/core/exec-credential.h
index f02770cec58..509c91e8299 100644
--- a/src/core/exec-credential.h
+++ b/src/core/exec-credential.h
@@ -9,7 +9,6 @@
 
 typedef struct ExecContext ExecContext;
 typedef struct ExecParameters ExecParameters;
-typedef struct Unit Unit;
 
 /* A credential configured with LoadCredential= */
 typedef struct ExecLoadCredential {
@@ -45,9 +44,8 @@ int exec_context_get_credential_directory(
                 const char *unit,
                 char **ret);
 
-int unit_add_default_credential_dependencies(Unit *u, const ExecContext *c);
-
 int exec_context_destroy_credentials(const ExecContext *c, const char *runtime_root, const char *unit);
+
 int exec_setup_credentials(
                 const ExecContext *context,
                 const ExecParameters *params,
diff --git a/src/core/unit.c b/src/core/unit.c
index a1e7b62b9af..1d2311f035a 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1337,10 +1337,6 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
                         return r;
         }
 
-        r = unit_add_default_credential_dependencies(u, c);
-        if (r < 0)
-                return r;
-
         return 0;
 }