From 996f297f9d882f6a506957e123d7735ed9dbbd79 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu, 12 Jul 2018 12:14:54 +0200
Subject: [PATCH] rmdir: catch ENOTEMPTY also when deleting a dir from a lower
 layer

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 main.c | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/main.c b/main.c
index 41cc32c..a412e68 100644
--- a/main.c
+++ b/main.c
@@ -1578,6 +1578,26 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
       return;
     }
 
+  if (dirp)
+    {
+      size_t c;
+
+      /* Re-load the directory.  */
+      node = load_dir (lo, node, node->layer, node->path, node->name);
+      if (node == NULL)
+        {
+          fuse_reply_err (req, errno);
+          return;
+        }
+
+      c = count_dir_entries (node);
+      if (c)
+        {
+          fuse_reply_err (req, ENOTEMPTY);
+          return;
+        }
+    }
+
   if (node->layer == get_upper_layer (lo))
     {
       node->hidden_dirfd = node->layer->fd;
@@ -1587,25 +1607,15 @@ do_rm (fuse_req_t req, fuse_ino_t parent, const char *name, bool dirp)
       else
         {
           DIR *dp;
-          size_t c = 0;
           int fd;
 
-          fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY ));
+          fd = TEMP_FAILURE_RETRY (openat (get_upper_layer (lo)->fd, node->path, O_DIRECTORY));
           if (fd < 0)
             {
               fuse_reply_err (req, errno);
               return;
             }
 
-          if (node->children)
-            c = count_dir_entries (node);
-          if (c)
-            {
-              close (fd);
-              fuse_reply_err (req, ENOTEMPTY);
-              return;
-            }
-
           if (fd >= 0)
             {
               dp = fdopendir (fd);