When iterating over a directory, it can be useful to put back the just read directory entry, so it can be retried at a later time. This will be needed for the EFI loader variable support.
Signed-off-by: Ahmad Fatoum <[email protected]> --- fs/fs.c | 15 +++++++++++++++ include/dirent.h | 1 + test/self/ramfs.c | 17 ++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 620cd6597a63..6583e0a6e9b3 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -890,6 +890,21 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen, return 0; } +int unreaddir(DIR *dir, const struct dirent *d) +{ + struct readdir_entry *entry; + + if (d != &dir->d) + return -EINVAL; + + entry = xzalloc(sizeof(*entry)); + entry->d = *d; + list_add_tail(&entry->list, &dir->entries); + + return 0; +} +EXPORT_SYMBOL(unreaddir); + struct dirent *readdir(DIR *dir) { struct readdir_entry *entry; diff --git a/include/dirent.h b/include/dirent.h index 61a76c5b59b9..285074e9f7de 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -18,6 +18,7 @@ typedef struct dir { DIR *opendir(const char *pathname); struct dirent *readdir(DIR *dir); +int unreaddir(DIR *dir, const struct dirent *d); int closedir(DIR *dir); #endif /* __DIRENT_H */ diff --git a/test/self/ramfs.c b/test/self/ramfs.c index 927b035e1e8c..f8e1d60a61b5 100644 --- a/test/self/ramfs.c +++ b/test/self/ramfs.c @@ -44,6 +44,7 @@ static inline int get_file_count(int i) static void test_ramfs(void) { + int files[] = { 1, 3, 5, 7, 11, 13, 17 }; char fname[128]; char *content = NULL; char *oldpwd = NULL; @@ -127,6 +128,7 @@ static void test_ramfs(void) goto out; i = 1; + j = 0; while ((d = readdir(dir))) { size_t size = 0; @@ -150,7 +152,20 @@ static void test_ramfs(void) free(buf); - i++; + /* + * For select files, we test unreaddir once and check if + * we read back same element on repeated readdir + */ + for (j = 0; j < ARRAY_SIZE(files); j++) { + if (size == files[j]) { + ret = unreaddir(dir, d); + expect_success(ret, "unreaddir"); + files[j] = -1; + break; + } + } + if (j == ARRAY_SIZE(files)) + i++; } expect_success(i == 90 ? 0 : -EINVAL, -- 2.30.2
