server-unix_name: Rebase and re-enable.

This commit is contained in:
Zebediah Figura 2022-09-05 00:58:09 -05:00
parent 7e2f1d392c
commit 533337e25e

View File

@ -1,4 +1,4 @@
From e390b67fa52b0808b71bb4c7feb08ca12a3a7444 Mon Sep 17 00:00:00 2001
From 58add0ceab2595c3b309548d94b203659834a38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Iv=C4=83ncescu?= <gabrielopcode@gmail.com>
Date: Mon, 21 Sep 2020 17:27:00 +0300
Subject: [PATCH] server: Try to retrieve the unix name on handles created from
@ -16,10 +16,10 @@ Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>
3 files changed, 42 insertions(+)
diff --git a/server/fd.c b/server/fd.c
index edb59b0d540..8348ed7cf97 100644
index eaebe044f37..db22076944e 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2012,6 +2012,45 @@ struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, s
@@ -2088,6 +2088,45 @@ struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, s
return NULL;
}
@ -66,10 +66,10 @@ index edb59b0d540..8348ed7cf97 100644
void *get_fd_user( struct fd *fd )
{
diff --git a/server/file.c b/server/file.c
index 2cc4a9d978c..0bbdae41649 100644
index 76c687833c9..5624e621eac 100644
--- a/server/file.c
+++ b/server/file.c
@@ -146,6 +146,7 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari
@@ -155,6 +155,7 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari
release_object( file );
return NULL;
}
@ -78,7 +78,7 @@ index 2cc4a9d978c..0bbdae41649 100644
return file;
}
diff --git a/server/file.h b/server/file.h
index 69f2bed6cd6..6967bda7279 100644
index 0ffe0e2c8dc..4d738edc7b7 100644
--- a/server/file.h
+++ b/server/file.h
@@ -22,6 +22,7 @@
@ -89,8 +89,8 @@ index 69f2bed6cd6..6967bda7279 100644
#include "object.h"
@@ -82,6 +83,7 @@ extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t
unsigned int access, unsigned int sharing, unsigned int options );
@@ -85,6 +86,7 @@ extern struct fd *open_fd( struct fd *root, const char *name, struct unicode_str
unsigned int sharing, unsigned int options );
extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops,
int unix_fd, struct object *user, unsigned int options );
+extern void set_unix_name_of_fd( struct fd *fd, const struct stat *fd_st );
@ -98,5 +98,5 @@ index 69f2bed6cd6..6967bda7279 100644
unsigned int options );
extern struct fd *get_fd_object_for_mapping( struct fd *fd, unsigned int access, unsigned int sharing );
--
2.29.2
2.35.1