Attachment 169112 Details for Bug 208464 – Patch for dependencies between svr4.ko & streams.ko due to symbols svr4_delete_socket & svr4_stream_get

[patch] Patch for dependencies between svr4.ko & streams.ko due to symbols svr4_delete_socket & svr4_stream_get

svr4depend.patch (text/plain), 2.31 KB, created by Kristoffer Eriksson on 2016-04-08 18:43:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kristoffer Eriksson

Created: 2016-04-08 18:43:23 UTC

Size: 2.31 KB

patch

obsolete

>--- sys/modules/streams/Makefile0	2016-03-25 01:09:42.000000000 +0000
>+++ sys/modules/streams/Makefile	2016-04-08 18:51:11.828604000 +0000
>@@ -5,10 +5,6 @@
> KMOD=	streams
> SRCS=	streams.c
> 
>-EXPORT_SYMS=	svr4_str_initialized	\
>-		svr4_stream_get		\
>-		svr4_delete_socket
>-
> .if defined(DEBUG)
> CFLAGS+= -DDEBUG_SVR4
> .endif
>--- sys/modules/svr4/Makefile0	2016-03-25 01:09:41.000000000 +0000
>+++ sys/modules/svr4/Makefile	2016-04-07 00:02:46.725659000 +0000
>@@ -8,6 +8,7 @@
> 	svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \
> 	svr4_machdep.c svr4_resource.c svr4_ipc.c
> OBJS=	svr4_locore.o 
>+EXPORT_SYMS= svr4_delete_socket
> 
> SRCS+=	opt_ktrace.h opt_sysvipc.h
> 
>--- sys/dev/streams/streams0.c	2016-03-25 01:09:39.000000000 +0000
>+++ sys/dev/streams/streams.c	2016-04-08 06:36:14.294644000 +0000
>@@ -176,6 +176,7 @@
> };
> DECLARE_MODULE(streams, streams_mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
> MODULE_VERSION(streams, 1);
>+MODULE_DEPEND(streams, svr4elf, 1, 1, 1);
> 
> /*
>  * We only need open() and close() routines.  open() calls socreate()
>@@ -329,19 +330,6 @@
> }
> 
> 
>-struct svr4_strm *
>-svr4_stream_get(fp)
>-	struct file *fp;
>-{
>-	struct socket *so;
>-
>-	if (fp == NULL || fp->f_type != DTYPE_SOCKET)
>-		return NULL;
>-
>-	so = fp->f_data;
>-	return so->so_emuldata;
>-}
>-
> static int
> svr4_soo_close(struct file *fp, struct thread *td)
> {
>--- sys/compat/svr4/svr4_socket0.c	2016-03-25 01:09:43.000000000 +0000
>+++ sys/compat/svr4/svr4_socket.c	2016-04-07 01:03:54.597296000 +0000
>@@ -66,6 +66,7 @@
> #include <compat/svr4/svr4_signal.h>
> #include <compat/svr4/svr4_sockmod.h>
> #include <compat/svr4/svr4_proto.h>
>+#include <compat/svr4/svr4_stropts.h>
> 
> struct svr4_sockcache_entry {
> 	struct proc *p;		/* Process for the socket		*/
>@@ -168,6 +169,19 @@
> 	mtx_unlock(&svr4_sockcache_lock);
> }
> 
>+struct svr4_strm *
>+svr4_stream_get(fp)
>+	struct file *fp;
>+{
>+	struct socket *so;
>+
>+	if (fp == NULL || fp->f_type != DTYPE_SOCKET)
>+		return NULL;
>+
>+	so = fp->f_data;
>+	return so->so_emuldata;
>+}
>+
> void
> svr4_purge_sockcache(arg, p)
> 	void *arg;
>--- sys/compat/svr4/svr4_sysvec0.c	2016-03-25 01:09:43.000000000 +0000
>+++ sys/compat/svr4/svr4_sysvec.c	2016-04-07 06:01:59.106473000 +0000
>@@ -313,4 +313,4 @@
> 	0
> };
> DECLARE_MODULE_TIED(svr4elf, svr4_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);
>-MODULE_DEPEND(svr4elf, streams, 1, 1, 1);
>+MODULE_VERSION(svr4elf, 1);

Actions: View | Diff

Attachments on bug 208464: 169112 | 169113