readdir: use mode from uppermost layer

differently than dev/ino number, use the uppermost mode found. Signed-off-by: Giuseppe Scrivano <[email protected]>
containers · Oct 3, 2019 · 0a8c375 · 0a8c375
1 parent cf99ad7
commit 0a8c375
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/main.c b/main.c
@@ -1197,7 +1197,8 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
                 {
                   ret->tmp_ino = st.st_ino;
                   ret->tmp_dev = st.st_dev;
-                  mode = st.st_mode;
+                  if (mode == 0)
+                    mode = st.st_mode;
                   ret->last_layer = it;
                 }
                 goto no_fd;
@@ -1208,7 +1209,8 @@ make_ovl_node (struct ovl_data *lo, const char *path, struct ovl_layer *layer, c
             {
               ret->tmp_ino = st.st_ino;
               ret->tmp_dev = st.st_dev;
-              mode = st.st_mode;
+              if (mode == 0)
+                mode = st.st_mode;
               ret->last_layer = it;
             }