Rebase against 75aa4ab16b03a11464ab0d3e4c4cfbff0180c269

This commit is contained in:
Alistair Leslie-Hughes
2019-04-24 09:36:21 +10:00
parent 4e7071e4f1
commit 38c1f5e4d5
9 changed files with 83 additions and 109 deletions

View File

@@ -1,4 +1,4 @@
From e5632cdae888ce1ed2274dc44d08eee6d2e9603e Mon Sep 17 00:00:00 2001
From a0cf4045fe4ac3e3d561824da30fc7998097f97b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 4 Dec 2015 10:36:47 +0100
Subject: [PATCH] server: Introduce a new alloc_handle object callback. (v2)
@@ -283,13 +283,13 @@ index 2a38780..e628cdb 100644
no_destroy /* destroy */
};
diff --git a/server/file.c b/server/file.c
index 224ab7d..ca9a368 100644
index 3ce7307..fa96ca7 100644
--- a/server/file.c
+++ b/server/file.c
@@ -96,6 +96,7 @@ static const struct object_ops file_ops =
@@ -98,6 +98,7 @@ static const struct object_ops file_ops =
NULL, /* unlink_name */
file_open_file, /* open_file */
no_kernel_obj_list, /* get_kernel_obj_list */
file_get_kernel_obj_list, /* get_kernel_obj_list */
+ no_alloc_handle, /* alloc_handle */
fd_close_handle, /* close_handle */
file_destroy /* destroy */
@@ -625,7 +625,7 @@ index 7d0d742..2ad9d5d 100644
snapshot_destroy /* destroy */
};
diff --git a/server/sock.c b/server/sock.c
index 4a10aac..f951f23 100644
index ac83081..d373768 100644
--- a/server/sock.c
+++ b/server/sock.c
@@ -156,6 +156,7 @@ static const struct object_ops sock_ops =