]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Revert "rm-rf: Make sure we rewinddir() before readdir()"
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 23 Oct 2023 11:56:38 +0000 (13:56 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 23 Oct 2023 11:56:38 +0000 (13:56 +0200)
This reverts commit 6bbb893b90e2dcb05fb310ba4608f9c9dc587845.

Let's try a different approach where we make sure that all callers only pass in
a fd that is "clean", i.e. at offset 0. The majority of callers of this function
(both direct and indirect) pass a freshly-opened fd, so the rewind call is not
needed.

src/shared/rm-rf.c

index e1dc4024dc68518e9afa14cc9d0f8b326390b5fc..4664215e906204123587d7b3b63e0b0f78aa5861 100644 (file)
@@ -365,10 +365,6 @@ static int rm_rf_children_impl(
                                                                strna(path));
                                 }
                         }
-
-                        /* Make sure we reset the iterator since we don't know the state the passed in file
-                         * descriptor is in. */
-                        rewinddir(d);
                 }
 
                 FOREACH_DIRENT_ALL(de, d, return -errno) {