svn commit: r355681 - in head/sys: kern sys

[Rick Macklem]

Author: rmacklem
Date: Fri Dec 13 00:14:12 2019
New Revision: 355681
URL: https://svnweb.freebsd.org/changeset/base/355681

Log:
  r355677 requires that vop_stdioctl() be global so it can be called from NFS.
  
  r355677 modified the NFS client so that it does lseek(SEEK_DATA/SEEK_HOLE)
  for NFSv4.2, but calls vop_stdioctl() otherwise. As such, vop_stdioctl()
  needs to be a global function.
  
  Missed during the code merge for r355677.

Modified:
  head/sys/kern/vfs_default.c
  head/sys/sys/vnode.h

Modified: head/sys/kern/vfs_default.c
==============================================================================
--- head/sys/kern/vfs_default.c	Thu Dec 12 23:55:34 2019	(r355680)
+++ head/sys/kern/vfs_default.c	Fri Dec 13 00:14:12 2019	(r355681)
@@ -87,7 +87,6 @@ static int vop_stdadd_writecount(struct vop_add_writec
 static int vop_stdcopy_file_range(struct vop_copy_file_range_args *ap);
 static int vop_stdfdatasync(struct vop_fdatasync_args *ap);
 static int vop_stdgetpages_async(struct vop_getpages_async_args *ap);
-static int vop_stdioctl(struct vop_ioctl_args *ap);
 
 /*
  * This vnode table stores what we want to do if the filesystem doesn't
@@ -1249,7 +1248,7 @@ vop_stdneed_inactive(struct vop_need_inactive_args *ap
 	return (1);
 }
 
-static int
+int
 vop_stdioctl(struct vop_ioctl_args *ap)
 {
 	struct vnode *vp;

Modified: head/sys/sys/vnode.h
==============================================================================
--- head/sys/sys/vnode.h	Thu Dec 12 23:55:34 2019	(r355680)
+++ head/sys/sys/vnode.h	Fri Dec 13 00:14:12 2019	(r355681)
@@ -760,6 +760,7 @@ int	vop_stdfsync(struct vop_fsync_args *);
 int	vop_stdgetwritemount(struct vop_getwritemount_args *);
 int	vop_stdgetpages(struct vop_getpages_args *);
 int	vop_stdinactive(struct vop_inactive_args *);
+int	vop_stdioctl(struct vop_ioctl_args *);
 int	vop_stdneed_inactive(struct vop_need_inactive_args *);
 int	vop_stdkqfilter(struct vop_kqfilter_args *);
 int	vop_stdlock(struct vop_lock1_args *);