Print this page
OS-5462 lxbrand kernel should be lint clean
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
OS-3554 lx brand: node.js test test-fs-append-file.js hangs on 64-bit
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/syscall/brandsys.c
+++ new/usr/src/uts/common/syscall/brandsys.c
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 -#pragma ident "%Z%%M% %I% %E% SMI"
26 +/*
27 + * Copyright 2016 Joyent, Inc.
28 + */
27 29
28 30 #include <sys/brand.h>
29 31 #include <sys/systm.h>
30 32 #include <sys/types.h>
31 33 #include <sys/zone.h>
32 34
33 35 /*
34 36 * brand(2) system call.
35 37 */
36 38 int64_t
37 39 brandsys(int cmd, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3,
38 - uintptr_t arg4, uintptr_t arg5, uintptr_t arg6)
40 + uintptr_t arg4)
39 41 {
40 42 struct proc *p = curthread->t_procp;
41 43 int64_t rval = 0;
42 44 int err;
43 45
44 46 /*
45 47 * The brandsys system call can only be executed from inside a
46 48 * branded zone.
47 49 */
48 50 if (INGLOBALZONE(p) || !ZONE_IS_BRANDED(p->p_zone))
49 51 return (set_errno(ENOSYS));
50 52
51 53 if ((err = ZBROP(p->p_zone)->b_brandsys(cmd, &rval, arg1, arg2, arg3,
52 - arg4, arg5, arg6)) != 0)
54 + arg4)) != 0)
53 55 return (set_errno(err));
54 56
55 57 return (rval);
56 58 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX