From: Mike Yuan Date: Wed, 11 Dec 2024 14:00:03 +0000 (+0100) Subject: nsresourced: drop unneeded REMOVE_PHYSICAL flag for rm_rf() X-Git-Tag: v258-rc1~1899 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2522757a89687acbcad859c41ec1792518d2c4ec;p=thirdparty%2Fsystemd.git nsresourced: drop unneeded REMOVE_PHYSICAL flag for rm_rf() Even without REMOVE_PHYSICAL, rm_rf() permits cgroupfs. --- diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c index a77ebc589b9..d69348aae71 100644 --- a/src/nsresourced/userns-registry.c +++ b/src/nsresourced/userns-registry.c @@ -567,7 +567,7 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) { cgroup_fd = safe_close(cgroup_fd); - r = rm_rf_child(parent_fd, fname, REMOVE_ONLY_DIRECTORIES|REMOVE_PHYSICAL|REMOVE_CHMOD); + r = rm_rf_child(parent_fd, fname, REMOVE_ONLY_DIRECTORIES|REMOVE_CHMOD); if (r < 0) log_debug_errno(r, "Failed to remove delegated cgroup %" PRIu64 ", ignoring: %m", cgroup_id);