From 45c902ea87f37c99f460628afcc4a70d669e2052 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Tue, 15 Oct 2019 12:31:22 +0200
Subject: [PATCH] main.c: reload the directory on stat

make sure the directory is reloaded so the correct number of links can
be retrieved.

Closes: https://github.com/containers/fuse-overlayfs/issues/131

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 main.c                   | 20 ++++++++++++++++++++
 tests/fedora-installs.sh |  5 +++++
 2 files changed, 25 insertions(+)

diff --git a/main.c b/main.c
index e5bdda1..f078973 100644
--- a/main.c
+++ b/main.c
@@ -1862,6 +1862,16 @@ ovl_lookup (fuse_req_t req, fuse_ino_t parent, const char *name)
       return;
     }
 
+  if (node_dirp (node))
+    {
+      node = reload_dir (lo, node);
+      if (node == NULL)
+        {
+          fuse_reply_err (req, errno);
+          return;
+        }
+    }
+
   err = rpl_stat (req, node, -1, NULL, NULL, &e.attr);
   if (err)
     {
@@ -2108,6 +2118,16 @@ ovl_do_readdir (fuse_req_t req, fuse_ino_t ino, size_t size,
           }
         else
           {
+            if (node_dirp (node))
+              {
+                node = reload_dir (lo, node);
+                if (node == NULL)
+                  {
+                    fuse_reply_err (req, errno);
+                    return;
+                  }
+              }
+
             memset (&e, 0, sizeof (e));
             ret = rpl_stat (req, node, -1, NULL, NULL, st);
             if (ret < 0)
diff --git a/tests/fedora-installs.sh b/tests/fedora-installs.sh
index 19d3b41..285e0a2 100755
--- a/tests/fedora-installs.sh
+++ b/tests/fedora-installs.sh
@@ -21,6 +21,11 @@ fuse-overlayfs -o sync=0,threaded=1,lowerdir=lower,upperdir=upper,workdir=workdi
 SUID_TEST=$(pwd)/suid-test
 (cd merged; $SUID_TEST)
 
+# Test the number of hard links for populated directories is > 2
+test $(stat -c %h merged/etc) -gt 2
+ls merged/usr
+test $(stat -c %h merged/usr) -gt 2
+
 stat -c %A upper/suid | grep s
 stat -c %a upper/nosuid | grep -v s