PERFORCE change 92981 for review

Robert Watson rwatson at FreeBSD.org
Wed Mar 8 13:02:06 PST 2006


http://perforce.freebsd.org/chv.cgi?CH=92981

Change 92981 by rwatson at rwatson_peppercorn on 2006/03/08 20:59:42

	lmount() didn't survive the last SEBSD integration, and is now
	obsoleted by the use of nmount().  Complete deletion/disabling.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 edit
.. //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 edit
.. //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/init_sysent.c#16 (text+ko) ====

@@ -486,5 +486,4 @@
 	{ SYF_MPSAFE | AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL },	/* 454 = _umtx_op */
 	{ SYF_MPSAFE | AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL },	/* 455 = thr_new */
 	{ SYF_MPSAFE | AS(__mac_get_fs_args), (sy_call_t *)__mac_get_fs, AUE_NULL },	/* 456 = __mac_get_fs */
-	{ AS(lmount_args), (sy_call_t *)nosys, AUE_NULL },	/* 457 = lmount */
 };

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#28 (text+ko) ====

@@ -1374,6 +1374,7 @@
 	return (ENOSYS);
 }
 
+#if 0
 int
 lmount(td, uap)
 	struct thread *td;
@@ -1381,5 +1382,6 @@
 {
 	return EINVAL;
 }
+#endif
 
 #endif /* !MAC */

==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.c#17 (text+ko) ====

@@ -464,5 +464,4 @@
 	"_umtx_op",			/* 454 = _umtx_op */
 	"thr_new",			/* 455 = thr_new */
 	"__mac_get_fs",			/* 456 = __mac_get_fs */
-	"lmount",			/* 457 = lmount */
 };

==== //depot/projects/trustedbsd/sebsd/sys/kern/syscalls.master#16 (text+ko) ====

@@ -792,9 +792,6 @@
 				    int param_size); }
 456	AUE_NULL	MSTD	{ int __mac_get_fs(const char *path_p, \
 				    struct mac *mac_p); }
-457	AUE_MOUNT	NOIMPL	{ int lmount(char *type, char *path, \
-				    int flags, caddr_t data, \
-				    struct mac *mac_p); }
 
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master

==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.h#17 (text+ko) ====

@@ -370,5 +370,4 @@
 #define	SYS__umtx_op	454
 #define	SYS_thr_new	455
 #define	SYS___mac_get_fs	456
-#define	SYS_lmount	457
-#define	SYS_MAXSYSCALL	458
+#define	SYS_MAXSYSCALL	457

==== //depot/projects/trustedbsd/sebsd/sys/sys/syscall.mk#17 (text+ko) ====

@@ -311,5 +311,4 @@
 	auditctl.o \
 	_umtx_op.o \
 	thr_new.o \
-	__mac_get_fs.o \
-	lmount.o
+	__mac_get_fs.o

==== //depot/projects/trustedbsd/sebsd/sys/sys/sysproto.h#17 (text+ko) ====

@@ -1357,13 +1357,6 @@
 	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
 	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
 };
-struct lmount_args {
-	char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
 int	nosys(struct thread *, struct nosys_args *);
 void	sys_exit(struct thread *, struct sys_exit_args *);
 int	fork(struct thread *, struct fork_args *);
@@ -1672,7 +1665,6 @@
 int	_umtx_op(struct thread *, struct _umtx_op_args *);
 int	thr_new(struct thread *, struct thr_new_args *);
 int	__mac_get_fs(struct thread *, struct __mac_get_fs_args *);
-int	lmount(struct thread *, struct lmount_args *);
 
 #ifdef COMPAT_43
 


More information about the trustedbsd-cvs mailing list