[PATCH 1/1] server: Ensure in pending delete on close that path to unlink are unique.

[Eric Pouech]

From: Eric Pouech

This avoids the server piling up closed_fd objects when several delete are
called on the same path.

Signed-off-by: Eric Pouech 
---
 server/fd.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/fd.c b/server/fd.c
index f28937466fc..b5f5cd24574 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -1171,6 +1171,18 @@ static struct inode *get_inode( dev_t dev, ino_t ino, int unix_fd )
     return inode;
 }

+static int inode_has_pending_close( struct inode *inode, const char *path )
+{
+    struct fd *fd;
+
+    LIST_FOR_EACH_ENTRY( fd, &inode->closed, struct fd, inode_entry )
+    {
+        if (fd->closed && !strcmp( fd->closed->unix_name, path ))
+            return 1;
+    }
+    return 0;
+}
+
 /* add fd to the inode list of file descriptors to close */
 static void inode_add_closed_fd( struct inode *inode, struct closed_fd *fd )
 {
@@ -1187,7 +1199,7 @@ static void inode_add_closed_fd( struct inode *inode, struct closed_fd *fd )
         free( fd->unix_name );
         free( fd );
     }
-    else if (fd->disp_flags & FILE_DISPOSITION_DELETE)
+    else if ((fd->disp_flags & FILE_DISPOSITION_DELETE) && !inode_has_pending_close( inode, fd->unix_name ))
     {
         /* close the fd but keep the structure around for unlink */
         if (fd->unix_fd != -1) close( fd->unix_fd );