Skip to contentSkip to conversation

test-openat: Consider device as well as inode number

PATCH New Mike Crowe 1 participant 1 message Aug 11, 2021

lore
Share & tools
lore

Mike Crowe

author
#0 lore raw

PATCH 1/1 test-openat: Consider device as well as inode number

It just so happens that my /home/mac and /home directories have the same inode number but on different filesystems.

This means that test-openat fails with "Recursion failed!" even when run without pseudo.

Let's consider both the device number and the inode number before assuming that we've found the same directory again.

---
 test/test-openat.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
test/test-openat.c +4 -1
index b710285..df6655a 100644
@@ -25,11 +25,13 @@ int main () {
     int fd, dir_fd;
     struct stat st;
     ino_t ino;
+    dev_t dev;
     char *path;
 
     fd = openat(AT_FDCWD, ".", O_DIRECTORY, 0);
     fstat(fd, &st);
     ino = st.st_ino;
+    dev = st.st_dev;
 
     while (1) {
         path = path_of(fd);
@@ -37,7 +39,7 @@ int main () {
 
         dir_fd = openat(fd, "../", O_DIRECTORY, 0);
         fstat(dir_fd, &st);
-        if (st.st_ino == ino) {
+        if (st.st_ino == ino && st.st_dev == dev) {
             if (strcmp(path, "/") == 0) {
                 //puts("Reached top of tree");
                 return 0;
@@ -49,6 +51,7 @@ int main () {
 
         free (path);
         ino = st.st_ino;
+        dev = st.st_dev;
         fd = dir_fd;
     }
     return 0;
Signature · 1 line
2.30.2