Module Name: src Committed By: martin Date: Wed Jun 21 16:50:22 UTC 2023
Modified Files: src/share/man/man9 [netbsd-10]: vnodeops.9 src/sys/kern [netbsd-10]: vnode_if.src Log Message: Pull up following revision(s) (requested by hannken in ticket #197): sys/kern/vnode_if.src: revision 1.85 share/man/man9/vnodeops.9: revision 1.101 VOP_IOCTL() is a wrapper around spec_ioctl() aka Xdev_ioctl() and protected with spec_io_enter()/spec_io_exit() so there is no need to force specific vnode locking. Set locking requirement to '= = =' (unchanged, locked or unlocked). To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.100.14.1 src/share/man/man9/vnodeops.9 cvs rdiff -u -r1.84 -r1.84.4.1 src/sys/kern/vnode_if.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/man/man9/vnodeops.9 diff -u src/share/man/man9/vnodeops.9:1.100 src/share/man/man9/vnodeops.9:1.100.14.1 --- src/share/man/man9/vnodeops.9:1.100 Sun Nov 19 21:06:10 2017 +++ src/share/man/man9/vnodeops.9 Wed Jun 21 16:50:21 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnodeops.9,v 1.100 2017/11/19 21:06:10 christos Exp $ +.\" $NetBSD: vnodeops.9,v 1.100.14.1 2023/06/21 16:50:21 martin Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 19, 2017 +.Dd June 15, 2023 .Dt VNODEOPS 9 .Os .Sh NAME @@ -709,7 +709,7 @@ existing data, or some other data, or tr Perform device-specific I/O. The argument .Fa vp -is the locked vnode of the file, normally representing a device. +is the vnode of the file, normally representing a device. The argument .Fa command specifies the device-specific operation to perform and Index: src/sys/kern/vnode_if.src diff -u src/sys/kern/vnode_if.src:1.84 src/sys/kern/vnode_if.src:1.84.4.1 --- src/sys/kern/vnode_if.src:1.84 Tue May 3 08:33:59 2022 +++ src/sys/kern/vnode_if.src Wed Jun 21 16:50:21 2023 @@ -1,4 +1,4 @@ -# $NetBSD: vnode_if.src,v 1.84 2022/05/03 08:33:59 hannken Exp $ +# $NetBSD: vnode_if.src,v 1.84.4.1 2023/06/21 16:50:21 martin Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -217,11 +217,11 @@ vop_fdiscard { }; # -#% ioctl vp U U U +#% ioctl vp = = = # vop_ioctl { FSTRANS=NO - IN LOCKED=NO struct vnode *vp; + IN struct vnode *vp; IN u_long command; IN void *data; IN int fflag;