From a6ae99363d9011bf08bbd7758c5394a5523be7a0 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 13 Jun 2023 16:01:17 +0200 Subject: rm-rf: Fix assertion This doesn't cover every case but cases where people try to do rm_rf(dir_fd, ".") are covered by unlinkat() simply failing. --- src/shared/rm-rf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/shared') diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c index 3a34281bb9..4664215e90 100644 --- a/src/shared/rm-rf.c +++ b/src/shared/rm-rf.c @@ -430,9 +430,7 @@ int rm_rf_at(int dir_fd, const char *path, RemoveFlags flags) { int fd, r, q = 0; assert(dir_fd >= 0 || dir_fd == AT_FDCWD); - - if (FLAGS_SET(flags, REMOVE_ROOT)) - assert(path && !dot_or_dot_dot(path)); /* unlinkat() does not support AT_EMPTY_PATH or "." so a path must be provided here. */ + assert(path); /* For now, don't support dropping subvols when also only dropping directories, since we can't do * this race-freely. */ -- cgit v1.2.3