Rebase against 0d91274defcf65093957cf8e43985b9be55642d5.

patches/ntdll-FileDispositionInformation/0001-server-Keep-a-pointer-to-parent-s-fd-unix_name-in-th.patch

@@ -1,4 +1,4 @@
-From e2337e9756c38d06661d6dabd4a04d97528c4ab1 Mon Sep 17 00:00:00 2001
+From 48231cd898005f4c3bbb3992776d480e7eee837b Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Thu, 7 Aug 2014 18:31:33 -0600
 Subject: server: Keep a pointer to parent's fd unix_name in the closed_fd
@@ -9,7 +9,7 @@ Subject: server: Keep a pointer to parent's fd unix_name in the closed_fd
  1 file changed, 21 insertions(+), 17 deletions(-)
 
 diff --git a/server/fd.c b/server/fd.c
-index 9a4aac4..cd62cc8 100644
+index a432ec7..397e51d 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -164,7 +164,8 @@ struct closed_fd
@@ -154,15 +154,15 @@ index 9a4aac4..cd62cc8 100644
          if (flags & O_TRUNC)
          {
              if (S_ISDIR(st.st_mode))
-@@ -1896,7 +1900,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
-             set_error( STATUS_NOT_A_DIRECTORY );
-             goto error;
-         }
+@@ -1891,7 +1895,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode,
+     }
+     else  /* special file */
+     {
 -        if (unlink_name[0])  /* we can't unlink special files */
 +        if (options & FILE_DELETE_ON_CLOSE)  /* we can't unlink special files */
          {
              set_error( STATUS_INVALID_PARAMETER );
              goto error;
 -- 
-2.3.3
+2.4.0