regenefactor for comment and whitespace changesdiff -r1.82 -r1.83 src/sys/kern/vnode_if.c
(pooka)
--- src/sys/kern/vnode_if.c 2010/04/10 19:44:02 1.82
+++ src/sys/kern/vnode_if.c 2010/04/14 12:21:04 1.83
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | /* $NetBSD: vnode_if.c,v 1.82 2010/04/10 19:44:02 pooka Exp $ */ | 1 | /* $NetBSD: vnode_if.c,v 1.83 2010/04/14 12:21:04 pooka Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Warning: DO NOT EDIT! This file is automatically generated! | 4 | * Warning: DO NOT EDIT! This file is automatically generated! | |
5 | * (Modifications made here may easily be lost!) | 5 | * (Modifications made here may easily be lost!) | |
6 | * | 6 | * | |
7 | * Created from the file: | 7 | * Created from the file: | |
8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | 8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | |
9 | * by the script: | 9 | * by the script: | |
10 | * NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp | 10 | * NetBSD: vnode_if.sh,v 1.55 2010/04/14 12:19:50 pooka Exp | |
11 | */ | 11 | */ | |
12 | 12 | |||
13 | /* | 13 | /* | |
14 | * Copyright (c) 1992, 1993, 1994, 1995 | 14 | * Copyright (c) 1992, 1993, 1994, 1995 | |
15 | * The Regents of the University of California. All rights reserved. | 15 | * The Regents of the University of California. All rights reserved. | |
16 | * | 16 | * | |
17 | * Redistribution and use in source and binary forms, with or without | 17 | * Redistribution and use in source and binary forms, with or without | |
18 | * modification, are permitted provided that the following conditions | 18 | * modification, are permitted provided that the following conditions | |
19 | * are met: | 19 | * are met: | |
20 | * 1. Redistributions of source code must retain the above copyright | 20 | * 1. Redistributions of source code must retain the above copyright | |
21 | * notice, this list of conditions and the following disclaimer. | 21 | * notice, this list of conditions and the following disclaimer. | |
22 | * 2. Redistributions in binary form must reproduce the above copyright | 22 | * 2. Redistributions in binary form must reproduce the above copyright | |
23 | * notice, this list of conditions and the following disclaimer in the | 23 | * notice, this list of conditions and the following disclaimer in the | |
@@ -30,27 +30,27 @@ | @@ -30,27 +30,27 @@ | |||
30 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 30 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
31 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 31 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
32 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | 32 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | |
33 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 33 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
39 | * SUCH DAMAGE. | 39 | * SUCH DAMAGE. | |
40 | */ | 40 | */ | |
41 | 41 | |||
42 | #include <sys/cdefs.h> | 42 | #include <sys/cdefs.h> | |
43 | __KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.82 2010/04/10 19:44:02 pooka Exp $"); | 43 | __KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.83 2010/04/14 12:21:04 pooka Exp $"); | |
44 | 44 | |||
45 | #include <sys/param.h> | 45 | #include <sys/param.h> | |
46 | #include <sys/mount.h> | 46 | #include <sys/mount.h> | |
47 | #include <sys/buf.h> | 47 | #include <sys/buf.h> | |
48 | #include <sys/vnode.h> | 48 | #include <sys/vnode.h> | |
49 | #include <sys/lock.h> | 49 | #include <sys/lock.h> | |
50 | 50 | |||
51 | const struct vnodeop_desc vop_default_desc = { | 51 | const struct vnodeop_desc vop_default_desc = { | |
52 | 0, | 52 | 0, | |
53 | "default", | 53 | "default", | |
54 | 0, | 54 | 0, | |
55 | NULL, | 55 | NULL, | |
56 | VDESC_NO_OFFSET, | 56 | VDESC_NO_OFFSET, | |
@@ -1629,28 +1629,26 @@ VOP_SETEXTATTR(struct vnode *vp, | @@ -1629,28 +1629,26 @@ VOP_SETEXTATTR(struct vnode *vp, | |||
1629 | a.a_desc = VDESC(vop_setextattr); | 1629 | a.a_desc = VDESC(vop_setextattr); | |
1630 | a.a_vp = vp; | 1630 | a.a_vp = vp; | |
1631 | a.a_attrnamespace = attrnamespace; | 1631 | a.a_attrnamespace = attrnamespace; | |
1632 | a.a_name = name; | 1632 | a.a_name = name; | |
1633 | a.a_uio = uio; | 1633 | a.a_uio = uio; | |
1634 | a.a_cred = cred; | 1634 | a.a_cred = cred; | |
1635 | mpsafe = (vp->v_vflag & VV_MPSAFE); | 1635 | mpsafe = (vp->v_vflag & VV_MPSAFE); | |
1636 | if (!mpsafe) { KERNEL_LOCK(1, curlwp); } | 1636 | if (!mpsafe) { KERNEL_LOCK(1, curlwp); } | |
1637 | error = (VCALL(vp, VOFFSET(vop_setextattr), &a)); | 1637 | error = (VCALL(vp, VOFFSET(vop_setextattr), &a)); | |
1638 | if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); } | 1638 | if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); } | |
1639 | return error; | 1639 | return error; | |
1640 | } | 1640 | } | |
1641 | 1641 | |||
1642 | /* End of special cases. */ | |||
1643 | ||||
1644 | const struct vnodeop_desc * const vfs_op_descs[] = { | 1642 | const struct vnodeop_desc * const vfs_op_descs[] = { | |
1645 | &vop_default_desc, /* MUST BE FIRST */ | 1643 | &vop_default_desc, /* MUST BE FIRST */ | |
1646 | &vop_bwrite_desc, /* XXX: SPECIAL CASE */ | 1644 | &vop_bwrite_desc, /* XXX: SPECIAL CASE */ | |
1647 | 1645 | |||
1648 | &vop_lookup_desc, | 1646 | &vop_lookup_desc, | |
1649 | &vop_create_desc, | 1647 | &vop_create_desc, | |
1650 | &vop_mknod_desc, | 1648 | &vop_mknod_desc, | |
1651 | &vop_open_desc, | 1649 | &vop_open_desc, | |
1652 | &vop_close_desc, | 1650 | &vop_close_desc, | |
1653 | &vop_access_desc, | 1651 | &vop_access_desc, | |
1654 | &vop_getattr_desc, | 1652 | &vop_getattr_desc, | |
1655 | &vop_setattr_desc, | 1653 | &vop_setattr_desc, | |
1656 | &vop_read_desc, | 1654 | &vop_read_desc, | |
@@ -1683,14 +1681,13 @@ const struct vnodeop_desc * const vfs_op | @@ -1683,14 +1681,13 @@ const struct vnodeop_desc * const vfs_op | |||
1683 | &vop_pathconf_desc, | 1681 | &vop_pathconf_desc, | |
1684 | &vop_advlock_desc, | 1682 | &vop_advlock_desc, | |
1685 | &vop_whiteout_desc, | 1683 | &vop_whiteout_desc, | |
1686 | &vop_getpages_desc, | 1684 | &vop_getpages_desc, | |
1687 | &vop_putpages_desc, | 1685 | &vop_putpages_desc, | |
1688 | &vop_closeextattr_desc, | 1686 | &vop_closeextattr_desc, | |
1689 | &vop_getextattr_desc, | 1687 | &vop_getextattr_desc, | |
1690 | &vop_listextattr_desc, | 1688 | &vop_listextattr_desc, | |
1691 | &vop_openextattr_desc, | 1689 | &vop_openextattr_desc, | |
1692 | &vop_deleteextattr_desc, | 1690 | &vop_deleteextattr_desc, | |
1693 | &vop_setextattr_desc, | 1691 | &vop_setextattr_desc, | |
1694 | NULL | 1692 | NULL | |
1695 | }; | 1693 | }; | |
1696 |
--- src/sys/rump/include/rump/rumpvnode_if.h 2010/04/10 19:44:02 1.5
+++ src/sys/rump/include/rump/rumpvnode_if.h 2010/04/14 12:21:05 1.6
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | /* $NetBSD: rumpvnode_if.h,v 1.5 2010/04/10 19:44:02 pooka Exp $ */ | 1 | /* $NetBSD: rumpvnode_if.h,v 1.6 2010/04/14 12:21:05 pooka Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Warning: DO NOT EDIT! This file is automatically generated! | 4 | * Warning: DO NOT EDIT! This file is automatically generated! | |
5 | * (Modifications made here may easily be lost!) | 5 | * (Modifications made here may easily be lost!) | |
6 | * | 6 | * | |
7 | * Created from the file: | 7 | * Created from the file: | |
8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | 8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | |
9 | * by the script: | 9 | * by the script: | |
10 | * NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp | 10 | * NetBSD: vnode_if.sh,v 1.55 2010/04/14 12:19:50 pooka Exp | |
11 | */ | 11 | */ | |
12 | 12 | |||
13 | /* | 13 | /* | |
14 | * Copyright (c) 1992, 1993, 1994, 1995 | 14 | * Copyright (c) 1992, 1993, 1994, 1995 | |
15 | * The Regents of the University of California. All rights reserved. | 15 | * The Regents of the University of California. All rights reserved. | |
16 | * | 16 | * | |
17 | * Redistribution and use in source and binary forms, with or without | 17 | * Redistribution and use in source and binary forms, with or without | |
18 | * modification, are permitted provided that the following conditions | 18 | * modification, are permitted provided that the following conditions | |
19 | * are met: | 19 | * are met: | |
20 | * 1. Redistributions of source code must retain the above copyright | 20 | * 1. Redistributions of source code must retain the above copyright | |
21 | * notice, this list of conditions and the following disclaimer. | 21 | * notice, this list of conditions and the following disclaimer. | |
22 | * 2. Redistributions in binary form must reproduce the above copyright | 22 | * 2. Redistributions in binary form must reproduce the above copyright | |
23 | * notice, this list of conditions and the following disclaimer in the | 23 | * notice, this list of conditions and the following disclaimer in the | |
@@ -34,41 +34,41 @@ | @@ -34,41 +34,41 @@ | |||
34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
39 | * SUCH DAMAGE. | 39 | * SUCH DAMAGE. | |
40 | */ | 40 | */ | |
41 | 41 | |||
42 | #ifndef _RUMP_RUMPVNODE_IF_H_ | 42 | #ifndef _RUMP_RUMPVNODE_IF_H_ | |
43 | #define _RUMP_RUMPVNODE_IF_H_ | 43 | #define _RUMP_RUMPVNODE_IF_H_ | |
44 | 44 | |||
45 | extern const struct vnodeop_desc rump_vop_default_desc; | 45 | extern const struct vnodeop_desc rump_vop_default_desc; | |
46 | 46 | |||
47 | ||||
48 | /* Special cases: */ | 47 | /* Special cases: */ | |
48 | ||||
49 | struct buf; | 49 | struct buf; | |
50 | #ifndef _KERNEL | 50 | #ifndef _KERNEL | |
51 | #include <stdbool.h> | 51 | #include <stdbool.h> | |
52 | #endif | 52 | #endif | |
53 | 53 | |||
54 | ||||
55 | #define RUMP_VOP_BWRITE_DESCOFFSET 1 | 54 | #define RUMP_VOP_BWRITE_DESCOFFSET 1 | |
56 | struct rump_vop_bwrite_args { | 55 | struct rump_vop_bwrite_args { | |
57 | const struct vnodeop_desc *a_desc; | 56 | const struct vnodeop_desc *a_desc; | |
58 | struct buf *a_bp; | 57 | struct buf *a_bp; | |
59 | }; | 58 | }; | |
60 | extern const struct vnodeop_desc rump_vop_bwrite_desc; | 59 | extern const struct vnodeop_desc rump_vop_bwrite_desc; | |
61 | int RUMP_VOP_BWRITE(struct buf *); | 60 | int RUMP_VOP_BWRITE(struct buf *); | |
61 | ||||
62 | /* End of special cases */ | 62 | /* End of special cases */ | |
63 | 63 | |||
64 | #define RUMP_VOP_LOOKUP_DESCOFFSET 2 | 64 | #define RUMP_VOP_LOOKUP_DESCOFFSET 2 | |
65 | struct rump_vop_lookup_args { | 65 | struct rump_vop_lookup_args { | |
66 | const struct vnodeop_desc *a_desc; | 66 | const struct vnodeop_desc *a_desc; | |
67 | struct vnode *a_dvp; | 67 | struct vnode *a_dvp; | |
68 | struct vnode **a_vpp; | 68 | struct vnode **a_vpp; | |
69 | struct componentname *a_cnp; | 69 | struct componentname *a_cnp; | |
70 | }; | 70 | }; | |
71 | extern const struct vnodeop_desc rump_vop_lookup_desc; | 71 | extern const struct vnodeop_desc rump_vop_lookup_desc; | |
72 | int RUMP_VOP_LOOKUP(struct vnode *, struct vnode **, struct componentname *); | 72 | int RUMP_VOP_LOOKUP(struct vnode *, struct vnode **, struct componentname *); | |
73 | 73 | |||
74 | #define RUMP_VOP_CREATE_DESCOFFSET 3 | 74 | #define RUMP_VOP_CREATE_DESCOFFSET 3 | |
@@ -546,16 +546,14 @@ struct rump_vop_setextattr_args { | @@ -546,16 +546,14 @@ struct rump_vop_setextattr_args { | |||
546 | const struct vnodeop_desc *a_desc; | 546 | const struct vnodeop_desc *a_desc; | |
547 | struct vnode *a_vp; | 547 | struct vnode *a_vp; | |
548 | int a_attrnamespace; | 548 | int a_attrnamespace; | |
549 | const char *a_name; | 549 | const char *a_name; | |
550 | struct uio *a_uio; | 550 | struct uio *a_uio; | |
551 | kauth_cred_t a_cred; | 551 | kauth_cred_t a_cred; | |
552 | }; | 552 | }; | |
553 | extern const struct vnodeop_desc rump_vop_setextattr_desc; | 553 | extern const struct vnodeop_desc rump_vop_setextattr_desc; | |
554 | int RUMP_VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, | 554 | int RUMP_VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, | |
555 | kauth_cred_t); | 555 | kauth_cred_t); | |
556 | 556 | |||
557 | #define VNODE_OPS_COUNT 48 | 557 | #define VNODE_OPS_COUNT 48 | |
558 | 558 | |||
559 | /* End of special cases. */ | |||
560 | ||||
561 | #endif /* !_RUMP_RUMPVNODE_IF_H_ */ | 559 | #endif /* !_RUMP_RUMPVNODE_IF_H_ */ |
--- src/sys/rump/librump/rumpvfs/rumpvnode_if.c 2010/04/10 19:44:02 1.4
+++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c 2010/04/14 12:21:05 1.5
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | /* $NetBSD: rumpvnode_if.c,v 1.4 2010/04/10 19:44:02 pooka Exp $ */ | 1 | /* $NetBSD: rumpvnode_if.c,v 1.5 2010/04/14 12:21:05 pooka Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Warning: DO NOT EDIT! This file is automatically generated! | 4 | * Warning: DO NOT EDIT! This file is automatically generated! | |
5 | * (Modifications made here may easily be lost!) | 5 | * (Modifications made here may easily be lost!) | |
6 | * | 6 | * | |
7 | * Created from the file: | 7 | * Created from the file: | |
8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | 8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | |
9 | * by the script: | 9 | * by the script: | |
10 | * NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp | 10 | * NetBSD: vnode_if.sh,v 1.55 2010/04/14 12:19:50 pooka Exp | |
11 | */ | 11 | */ | |
12 | 12 | |||
13 | /* | 13 | /* | |
14 | * Copyright (c) 1992, 1993, 1994, 1995 | 14 | * Copyright (c) 1992, 1993, 1994, 1995 | |
15 | * The Regents of the University of California. All rights reserved. | 15 | * The Regents of the University of California. All rights reserved. | |
16 | * | 16 | * | |
17 | * Redistribution and use in source and binary forms, with or without | 17 | * Redistribution and use in source and binary forms, with or without | |
18 | * modification, are permitted provided that the following conditions | 18 | * modification, are permitted provided that the following conditions | |
19 | * are met: | 19 | * are met: | |
20 | * 1. Redistributions of source code must retain the above copyright | 20 | * 1. Redistributions of source code must retain the above copyright | |
21 | * notice, this list of conditions and the following disclaimer. | 21 | * notice, this list of conditions and the following disclaimer. | |
22 | * 2. Redistributions in binary form must reproduce the above copyright | 22 | * 2. Redistributions in binary form must reproduce the above copyright | |
23 | * notice, this list of conditions and the following disclaimer in the | 23 | * notice, this list of conditions and the following disclaimer in the | |
@@ -30,27 +30,27 @@ | @@ -30,27 +30,27 @@ | |||
30 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 30 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | |
31 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 31 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | |
32 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | 32 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | |
33 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 33 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | |
34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
39 | * SUCH DAMAGE. | 39 | * SUCH DAMAGE. | |
40 | */ | 40 | */ | |
41 | 41 | |||
42 | #include <sys/cdefs.h> | 42 | #include <sys/cdefs.h> | |
43 | __KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.4 2010/04/10 19:44:02 pooka Exp $"); | 43 | __KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.5 2010/04/14 12:21:05 pooka Exp $"); | |
44 | 44 | |||
45 | #include <sys/param.h> | 45 | #include <sys/param.h> | |
46 | #include <sys/mount.h> | 46 | #include <sys/mount.h> | |
47 | #include <sys/buf.h> | 47 | #include <sys/buf.h> | |
48 | #include <sys/vnode.h> | 48 | #include <sys/vnode.h> | |
49 | #include <sys/lock.h> | 49 | #include <sys/lock.h> | |
50 | #include <rump/rumpvnode_if.h> | 50 | #include <rump/rumpvnode_if.h> | |
51 | #include "rump_private.h" | 51 | #include "rump_private.h" | |
52 | 52 | |||
53 | const struct vnodeop_desc rump_vop_default_desc = { | 53 | const struct vnodeop_desc rump_vop_default_desc = { | |
54 | 0, | 54 | 0, | |
55 | "default", | 55 | "default", | |
56 | 0, | 56 | 0, | |
@@ -1725,28 +1725,26 @@ RUMP_VOP_SETEXTATTR(struct vnode *vp, | @@ -1725,28 +1725,26 @@ RUMP_VOP_SETEXTATTR(struct vnode *vp, | |||
1725 | a.a_attrnamespace = attrnamespace; | 1725 | a.a_attrnamespace = attrnamespace; | |
1726 | a.a_name = name; | 1726 | a.a_name = name; | |
1727 | a.a_uio = uio; | 1727 | a.a_uio = uio; | |
1728 | a.a_cred = cred; | 1728 | a.a_cred = cred; | |
1729 | mpsafe = (vp->v_vflag & VV_MPSAFE); | 1729 | mpsafe = (vp->v_vflag & VV_MPSAFE); | |
1730 | rump_schedule(); | 1730 | rump_schedule(); | |
1731 | if (!mpsafe) { KERNEL_LOCK(1, curlwp); } | 1731 | if (!mpsafe) { KERNEL_LOCK(1, curlwp); } | |
1732 | error = (VCALL(vp, VOFFSET(rump_vop_setextattr), &a)); | 1732 | error = (VCALL(vp, VOFFSET(rump_vop_setextattr), &a)); | |
1733 | if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); } | 1733 | if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); } | |
1734 | rump_unschedule(); | 1734 | rump_unschedule(); | |
1735 | return error; | 1735 | return error; | |
1736 | } | 1736 | } | |
1737 | 1737 | |||
1738 | /* End of special cases. */ | |||
1739 | ||||
1740 | const struct vnodeop_desc * const rump_vfs_op_descs[] = { | 1738 | const struct vnodeop_desc * const rump_vfs_op_descs[] = { | |
1741 | &rump_vop_default_desc, /* MUST BE FIRST */ | 1739 | &rump_vop_default_desc, /* MUST BE FIRST */ | |
1742 | &rump_vop_bwrite_desc, /* XXX: SPECIAL CASE */ | 1740 | &rump_vop_bwrite_desc, /* XXX: SPECIAL CASE */ | |
1743 | 1741 | |||
1744 | &rump_vop_lookup_desc, | 1742 | &rump_vop_lookup_desc, | |
1745 | &rump_vop_create_desc, | 1743 | &rump_vop_create_desc, | |
1746 | &rump_vop_mknod_desc, | 1744 | &rump_vop_mknod_desc, | |
1747 | &rump_vop_open_desc, | 1745 | &rump_vop_open_desc, | |
1748 | &rump_vop_close_desc, | 1746 | &rump_vop_close_desc, | |
1749 | &rump_vop_access_desc, | 1747 | &rump_vop_access_desc, | |
1750 | &rump_vop_getattr_desc, | 1748 | &rump_vop_getattr_desc, | |
1751 | &rump_vop_setattr_desc, | 1749 | &rump_vop_setattr_desc, | |
1752 | &rump_vop_read_desc, | 1750 | &rump_vop_read_desc, | |
@@ -1779,14 +1777,13 @@ const struct vnodeop_desc * const rump_v | @@ -1779,14 +1777,13 @@ const struct vnodeop_desc * const rump_v | |||
1779 | &rump_vop_pathconf_desc, | 1777 | &rump_vop_pathconf_desc, | |
1780 | &rump_vop_advlock_desc, | 1778 | &rump_vop_advlock_desc, | |
1781 | &rump_vop_whiteout_desc, | 1779 | &rump_vop_whiteout_desc, | |
1782 | &rump_vop_getpages_desc, | 1780 | &rump_vop_getpages_desc, | |
1783 | &rump_vop_putpages_desc, | 1781 | &rump_vop_putpages_desc, | |
1784 | &rump_vop_closeextattr_desc, | 1782 | &rump_vop_closeextattr_desc, | |
1785 | &rump_vop_getextattr_desc, | 1783 | &rump_vop_getextattr_desc, | |
1786 | &rump_vop_listextattr_desc, | 1784 | &rump_vop_listextattr_desc, | |
1787 | &rump_vop_openextattr_desc, | 1785 | &rump_vop_openextattr_desc, | |
1788 | &rump_vop_deleteextattr_desc, | 1786 | &rump_vop_deleteextattr_desc, | |
1789 | &rump_vop_setextattr_desc, | 1787 | &rump_vop_setextattr_desc, | |
1790 | NULL | 1788 | NULL | |
1791 | }; | 1789 | }; | |
1792 |
--- src/sys/sys/vnode_if.h 2010/04/10 19:44:02 1.76
+++ src/sys/sys/vnode_if.h 2010/04/14 12:21:05 1.77
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | /* $NetBSD: vnode_if.h,v 1.76 2010/04/10 19:44:02 pooka Exp $ */ | 1 | /* $NetBSD: vnode_if.h,v 1.77 2010/04/14 12:21:05 pooka Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Warning: DO NOT EDIT! This file is automatically generated! | 4 | * Warning: DO NOT EDIT! This file is automatically generated! | |
5 | * (Modifications made here may easily be lost!) | 5 | * (Modifications made here may easily be lost!) | |
6 | * | 6 | * | |
7 | * Created from the file: | 7 | * Created from the file: | |
8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | 8 | * NetBSD: vnode_if.src,v 1.58 2008/11/15 19:08:12 pooka Exp | |
9 | * by the script: | 9 | * by the script: | |
10 | * NetBSD: vnode_if.sh,v 1.54 2010/04/10 19:41:54 pooka Exp | 10 | * NetBSD: vnode_if.sh,v 1.55 2010/04/14 12:19:50 pooka Exp | |
11 | */ | 11 | */ | |
12 | 12 | |||
13 | /* | 13 | /* | |
14 | * Copyright (c) 1992, 1993, 1994, 1995 | 14 | * Copyright (c) 1992, 1993, 1994, 1995 | |
15 | * The Regents of the University of California. All rights reserved. | 15 | * The Regents of the University of California. All rights reserved. | |
16 | * | 16 | * | |
17 | * Redistribution and use in source and binary forms, with or without | 17 | * Redistribution and use in source and binary forms, with or without | |
18 | * modification, are permitted provided that the following conditions | 18 | * modification, are permitted provided that the following conditions | |
19 | * are met: | 19 | * are met: | |
20 | * 1. Redistributions of source code must retain the above copyright | 20 | * 1. Redistributions of source code must retain the above copyright | |
21 | * notice, this list of conditions and the following disclaimer. | 21 | * notice, this list of conditions and the following disclaimer. | |
22 | * 2. Redistributions in binary form must reproduce the above copyright | 22 | * 2. Redistributions in binary form must reproduce the above copyright | |
23 | * notice, this list of conditions and the following disclaimer in the | 23 | * notice, this list of conditions and the following disclaimer in the | |
@@ -34,41 +34,41 @@ | @@ -34,41 +34,41 @@ | |||
34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | 34 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | |
35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | 35 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | |
36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | 36 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | |
37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 37 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | |
38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 38 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | |
39 | * SUCH DAMAGE. | 39 | * SUCH DAMAGE. | |
40 | */ | 40 | */ | |
41 | 41 | |||
42 | #ifndef _SYS_VNODE_IF_H_ | 42 | #ifndef _SYS_VNODE_IF_H_ | |
43 | #define _SYS_VNODE_IF_H_ | 43 | #define _SYS_VNODE_IF_H_ | |
44 | 44 | |||
45 | extern const struct vnodeop_desc vop_default_desc; | 45 | extern const struct vnodeop_desc vop_default_desc; | |
46 | 46 | |||
47 | ||||
48 | /* Special cases: */ | 47 | /* Special cases: */ | |
48 | ||||
49 | struct buf; | 49 | struct buf; | |
50 | #ifndef _KERNEL | 50 | #ifndef _KERNEL | |
51 | #include <stdbool.h> | 51 | #include <stdbool.h> | |
52 | #endif | 52 | #endif | |
53 | 53 | |||
54 | ||||
55 | #define VOP_BWRITE_DESCOFFSET 1 | 54 | #define VOP_BWRITE_DESCOFFSET 1 | |
56 | struct vop_bwrite_args { | 55 | struct vop_bwrite_args { | |
57 | const struct vnodeop_desc *a_desc; | 56 | const struct vnodeop_desc *a_desc; | |
58 | struct buf *a_bp; | 57 | struct buf *a_bp; | |
59 | }; | 58 | }; | |
60 | extern const struct vnodeop_desc vop_bwrite_desc; | 59 | extern const struct vnodeop_desc vop_bwrite_desc; | |
61 | int VOP_BWRITE(struct buf *); | 60 | int VOP_BWRITE(struct buf *); | |
61 | ||||
62 | /* End of special cases */ | 62 | /* End of special cases */ | |
63 | 63 | |||
64 | #define VOP_LOOKUP_DESCOFFSET 2 | 64 | #define VOP_LOOKUP_DESCOFFSET 2 | |
65 | struct vop_lookup_args { | 65 | struct vop_lookup_args { | |
66 | const struct vnodeop_desc *a_desc; | 66 | const struct vnodeop_desc *a_desc; | |
67 | struct vnode *a_dvp; | 67 | struct vnode *a_dvp; | |
68 | struct vnode **a_vpp; | 68 | struct vnode **a_vpp; | |
69 | struct componentname *a_cnp; | 69 | struct componentname *a_cnp; | |
70 | }; | 70 | }; | |
71 | extern const struct vnodeop_desc vop_lookup_desc; | 71 | extern const struct vnodeop_desc vop_lookup_desc; | |
72 | int VOP_LOOKUP(struct vnode *, struct vnode **, struct componentname *); | 72 | int VOP_LOOKUP(struct vnode *, struct vnode **, struct componentname *); | |
73 | 73 | |||
74 | #define VOP_CREATE_DESCOFFSET 3 | 74 | #define VOP_CREATE_DESCOFFSET 3 | |
@@ -545,16 +545,14 @@ struct vop_setextattr_args { | @@ -545,16 +545,14 @@ struct vop_setextattr_args { | |||
545 | const struct vnodeop_desc *a_desc; | 545 | const struct vnodeop_desc *a_desc; | |
546 | struct vnode *a_vp; | 546 | struct vnode *a_vp; | |
547 | int a_attrnamespace; | 547 | int a_attrnamespace; | |
548 | const char *a_name; | 548 | const char *a_name; | |
549 | struct uio *a_uio; | 549 | struct uio *a_uio; | |
550 | kauth_cred_t a_cred; | 550 | kauth_cred_t a_cred; | |
551 | }; | 551 | }; | |
552 | extern const struct vnodeop_desc vop_setextattr_desc; | 552 | extern const struct vnodeop_desc vop_setextattr_desc; | |
553 | int VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, | 553 | int VOP_SETEXTATTR(struct vnode *, int, const char *, struct uio *, | |
554 | kauth_cred_t); | 554 | kauth_cred_t); | |
555 | 555 | |||
556 | #define VNODE_OPS_COUNT 48 | 556 | #define VNODE_OPS_COUNT 48 | |
557 | 557 | |||
558 | /* End of special cases. */ | |||
559 | ||||
560 | #endif /* !_SYS_VNODE_IF_H_ */ | 558 | #endif /* !_SYS_VNODE_IF_H_ */ |