svn commit: r352052 - in projects/nfsv42/sys: fs/nfsclient kern sys

[Rick Macklem]

Author: rmacklem
Date: Mon Sep  9 01:05:51 2019
New Revision: 352052
URL: https://svnweb.freebsd.org/changeset/base/352052

Log:
  Make vop_stdioctl() a global function so that nfs_ioctl() can call it.

Modified:
  projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c
  projects/nfsv42/sys/kern/vfs_default.c
  projects/nfsv42/sys/sys/vnode.h

Modified: projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c
==============================================================================
--- projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c	Mon Sep  9 00:46:22 2019	(r352051)
+++ projects/nfsv42/sys/fs/nfsclient/nfs_clvnops.c	Mon Sep  9 01:05:51 2019	(r352052)
@@ -3706,11 +3706,7 @@ nfs_ioctl(struct vop_ioctl_args *ap)
 		return (ENOTTY);
 	nmp = VFSTONFS(vp->v_mount);
 	if (!NFSHASNFSV4(nmp) || nmp->nm_minorvers < NFSV42_MINORVERSION) {
-#ifdef notyet
 		error = vop_stdioctl(ap);
-#else
-		error = ENOTTY;
-#endif
 		return (error);
 	}
 

Modified: projects/nfsv42/sys/kern/vfs_default.c
==============================================================================
--- projects/nfsv42/sys/kern/vfs_default.c	Mon Sep  9 00:46:22 2019	(r352051)
+++ projects/nfsv42/sys/kern/vfs_default.c	Mon Sep  9 01:05:51 2019	(r352052)
@@ -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
@@ -1173,7 +1172,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: projects/nfsv42/sys/sys/vnode.h
==============================================================================
--- projects/nfsv42/sys/sys/vnode.h	Mon Sep  9 00:46:22 2019	(r352051)
+++ projects/nfsv42/sys/sys/vnode.h	Mon Sep  9 01:05:51 2019	(r352052)
@@ -757,6 +757,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_stdislocked(struct vop_islocked_args *);
 int	vop_stdkqfilter(struct vop_kqfilter_args *);