Merge pull request #18320 from yuwata/network-reduce-trigger-network-events

network: do not trigger unnecessary network events

src/basic/fs-util.c

@@ -1614,7 +1614,7 @@ int path_is_encrypted(const char *path) {
         return blockdev_is_encrypted(p, 10 /* safety net: maximum recursion depth */);
 }
 
-int conservative_rename(
+int conservative_renameat(
                 int olddirfd, const char *oldpath,
                 int newdirfd, const char *newpath) {
 

src/basic/fs-util.h

@@ -143,4 +143,7 @@ int open_parent(const char *path, int flags, mode_t mode);
 
 int path_is_encrypted(const char *path);
 
-int conservative_rename(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
+int conservative_renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
+static inline int conservative_rename(const char *oldpath, const char *newpath) {
+        return conservative_renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath);
+}