From owner-p4-projects@FreeBSD.ORG Thu Sep 18 20:20:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66DE7106566C; Thu, 18 Sep 2008 20:20:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1197D1065678 for ; Thu, 18 Sep 2008 20:20:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F26618FC21 for ; Thu, 18 Sep 2008 20:20:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8IKKCCS029660 for ; Thu, 18 Sep 2008 20:20:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8IKKCBu029653 for perforce@freebsd.org; Thu, 18 Sep 2008 20:20:12 GMT (envelope-from imp@freebsd.org) Date: Thu, 18 Sep 2008 20:20:12 GMT Message-Id: <200809182020.m8IKKCBu029653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 150043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2008 20:20:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=150043 Change 150043 by imp@imp_paco-paco on 2008/09/18 20:19:58 IFC @150042 Affected files ... .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/mips2/src/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/mips2/src/sys/kern/vfs_cache.c#13 integrate Differences ... ==== //depot/projects/mips2/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c,v 1.3 2008/09/18 19:57:06 imp Exp $"); #include #include ==== //depot/projects/mips2/src/sys/cddl/compat/opensolaris/sys/atomic.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.4 2008/05/22 08:33:24 jb Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/atomic.h,v 1.5 2008/09/18 19:57:06 imp Exp $ */ #ifndef _OPENSOLARIS_SYS_ATOMIC_H_ ==== //depot/projects/mips2/src/sys/kern/kern_syscalls.c#3 (text+ko) ==== @@ -25,113 +25,113 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.12 2006/08/01 16:32:20 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.13 2008/09/18 20:10:11 jhb Exp $"); #include -#include -#include -#include #include -#include +#include #include -#include +#include +#include +#include /* - * Acts like "nosys" but can be identified in sysent for dynamic call - * number assignment for a limited number of calls. - * + * Acts like "nosys" but can be identified in sysent for dynamic call + * number assignment for a limited number of calls. + * * Place holder for system call slots reserved for loadable modules. - */ + */ int lkmnosys(struct thread *td, struct nosys_args *args) { - return(nosys(td, args)); + + return (nosys(td, args)); } int lkmressys(struct thread *td, struct nosys_args *args) { - return(nosys(td, args)); + + return (nosys(td, args)); } int syscall_register(int *offset, struct sysent *new_sysent, - struct sysent *old_sysent) + struct sysent *old_sysent) { - if (*offset == NO_SYSCALL) { - int i; + int i; - for (i = 1; i < SYS_MAXSYSCALL; ++i) - if (sysent[i].sy_call == (sy_call_t *)lkmnosys) - break; - if (i == SYS_MAXSYSCALL) - return ENFILE; - *offset = i; - } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) - return EINVAL; - else if (sysent[*offset].sy_call != (sy_call_t *)lkmnosys && - sysent[*offset].sy_call != (sy_call_t *)lkmressys) - return EEXIST; + if (*offset == NO_SYSCALL) { + for (i = 1; i < SYS_MAXSYSCALL; ++i) + if (sysent[i].sy_call == (sy_call_t *)lkmnosys) + break; + if (i == SYS_MAXSYSCALL) + return (ENFILE); + *offset = i; + } else if (*offset < 0 || *offset >= SYS_MAXSYSCALL) + return (EINVAL); + else if (sysent[*offset].sy_call != (sy_call_t *)lkmnosys && + sysent[*offset].sy_call != (sy_call_t *)lkmressys) + return (EEXIST); - *old_sysent = sysent[*offset]; - sysent[*offset] = *new_sysent; - return 0; + *old_sysent = sysent[*offset]; + sysent[*offset] = *new_sysent; + return (0); } int syscall_deregister(int *offset, struct sysent *old_sysent) { - if (*offset) - sysent[*offset] = *old_sysent; - return 0; + + if (*offset) + sysent[*offset] = *old_sysent; + return (0); } int syscall_module_handler(struct module *mod, int what, void *arg) { - struct syscall_module_data *data = (struct syscall_module_data*)arg; - modspecific_t ms; - int error; + struct syscall_module_data *data = arg; + modspecific_t ms; + int error; - switch (what) { - case MOD_LOAD : - error = syscall_register(data->offset, data->new_sysent, - &data->old_sysent); - if (error) { - /* Leave a mark so we know to safely unload below. */ - data->offset = NULL; - return error; - } - ms.intval = *data->offset; - MOD_XLOCK; - module_setspecific(mod, &ms); - MOD_XUNLOCK; - if (data->chainevh) - error = data->chainevh(mod, what, data->chainarg); - return error; + switch (what) { + case MOD_LOAD: + error = syscall_register(data->offset, data->new_sysent, + &data->old_sysent); + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; + return (error); + } + ms.intval = *data->offset; + MOD_XLOCK; + module_setspecific(mod, &ms); + MOD_XUNLOCK; + if (data->chainevh) + error = data->chainevh(mod, what, data->chainarg); + return (error); + case MOD_UNLOAD: + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); + if (data->chainevh) { + error = data->chainevh(mod, what, data->chainarg); + if (error) + return error; + } + error = syscall_deregister(data->offset, &data->old_sysent); + return (error); + default: + return EOPNOTSUPP; + } - case MOD_UNLOAD : - /* - * MOD_LOAD failed, so just return without calling the - * chained handler since we didn't pass along the MOD_LOAD - * event. - */ - if (data->offset == NULL) - return (0); - if (data->chainevh) { - error = data->chainevh(mod, what, data->chainarg); - if (error) - return error; - } - error = syscall_deregister(data->offset, &data->old_sysent); - return error; - default : - return EOPNOTSUPP; - - } - - if (data->chainevh) - return data->chainevh(mod, what, data->chainarg); - else - return 0; + if (data->chainevh) + return (data->chainevh(mod, what, data->chainarg)); + else + return (0); } ==== //depot/projects/mips2/src/sys/kern/vfs_cache.c#13 (text+ko) ==== @@ -33,23 +33,23 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.124 2008/08/23 15:13:39 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.125 2008/09/18 20:04:22 jhb Exp $"); #include -#include +#include +#include #include #include +#include +#include #include -#include -#include -#include #include -#include +#include #include +#include #include -#include -#include -#include +#include +#include #include