svn commit: r294612 - in stable/10: share/man/man9 sys/fs/devfs sys/sys

[John Baldwin]

Author: jhb
Date: Sat Jan 23 01:02:28 2016
New Revision: 294612
URL: https://svnweb.freebsd.org/changeset/base/294612

Log:
  MFC 286974,291653:
  
  286974:
  Remove reference to non-existent kern_openat(9).
  
  291653:
  The cdevpriv_dtr_t typedef was not able to be used in a function prototype
  like the various d_*_t typedefs since it declared a function pointer rather
  than a function.  Add a new d_priv_dtor_t typedef that declares the function
  and can be used as a function prototype.  The previous typedef wasn't
  useful outside of the cdevpriv implementation, so retire it.
  
  The name d_priv_dtor_t was chosen to be more consistent with cdev methods
  since it is commonly used in place of d_close_t even though it is not a
  direct pointer in struct cdevsw.

Modified:
  stable/10/share/man/man9/devfs_set_cdevpriv.9
  stable/10/sys/fs/devfs/devfs_vnops.c
  stable/10/sys/sys/conf.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man9/devfs_set_cdevpriv.9
==============================================================================
--- stable/10/share/man/man9/devfs_set_cdevpriv.9	Sat Jan 23 00:28:18 2016	(r294611)
+++ stable/10/share/man/man9/devfs_set_cdevpriv.9	Sat Jan 23 01:02:28 2016	(r294612)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 15, 2012
+.Dd December 2, 2015
 .Dt DEVFS_CDEVPRIV 9
 .Os
 .Sh NAME
@@ -36,12 +36,12 @@
 .In sys/param.h
 .In sys/conf.h
 .Bd -literal
-typedef	void (*cdevpriv_dtr_t)(void *data);
+typedef	void d_priv_dtor_t(void *data);
 .Ed
 .Ft int
 .Fn devfs_get_cdevpriv "void **datap"
 .Ft int
-.Fn devfs_set_cdevpriv "void *priv" "cdevpriv_dtr_t dtr"
+.Fn devfs_set_cdevpriv "void *priv" "d_priv_dtor_t *dtr"
 .Ft void
 .Fn devfs_clear_cdevpriv "void"
 .Sh DESCRIPTION
@@ -116,8 +116,7 @@ was called.
 .Sh SEE ALSO
 .Xr open 2 ,
 .Xr close 2 ,
-.Xr devfs 5 ,
-.Xr kern_openat 9
+.Xr devfs 5
 .Sh HISTORY
 The
 .Fn devfs_cdevpriv

Modified: stable/10/sys/fs/devfs/devfs_vnops.c
==============================================================================
--- stable/10/sys/fs/devfs/devfs_vnops.c	Sat Jan 23 00:28:18 2016	(r294611)
+++ stable/10/sys/fs/devfs/devfs_vnops.c	Sat Jan 23 01:02:28 2016	(r294612)
@@ -146,7 +146,7 @@ devfs_get_cdevpriv(void **datap)
 }
 
 int
-devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t priv_dtr)
+devfs_set_cdevpriv(void *priv, d_priv_dtor_t *priv_dtr)
 {
 	struct file *fp;
 	struct cdev_priv *cdp;

Modified: stable/10/sys/sys/conf.h
==============================================================================
--- stable/10/sys/sys/conf.h	Sat Jan 23 00:28:18 2016	(r294611)
+++ stable/10/sys/sys/conf.h	Sat Jan 23 01:02:28 2016	(r294612)
@@ -297,9 +297,9 @@ void	setconf(void);
 
 #define	dev2unit(d)	((d)->si_drv0)
 
-typedef	void (*cdevpriv_dtr_t)(void *data);
+typedef void d_priv_dtor_t(void *data);
 int	devfs_get_cdevpriv(void **datap);
-int	devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t dtr);
+int	devfs_set_cdevpriv(void *priv, d_priv_dtor_t *dtr);
 void	devfs_clear_cdevpriv(void);
 void	devfs_fpdrop(struct file *fp);	/* XXX This is not public KPI */