svn commit: r349280 - head/sys/sys

[Alan Somers]

Author: asomers
Date: Fri Jun 21 21:50:14 2019
New Revision: 349280
URL: https://svnweb.freebsd.org/changeset/base/349280

Log:
  Reduce namespace pollution from r349233
  
  Define __daddr_t in _types.h and use it in filio.h
  
  Reported by:	ian, bde
  Reviewed by:	ian, imp, cem
  MFC after:	2 weeks
  MFC-With:	349233
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D20715

Modified:
  head/sys/sys/_types.h
  head/sys/sys/filio.h
  head/sys/sys/types.h

Modified: head/sys/sys/_types.h
==============================================================================
--- head/sys/sys/_types.h	Fri Jun 21 21:44:31 2019	(r349279)
+++ head/sys/sys/_types.h	Fri Jun 21 21:50:14 2019	(r349280)
@@ -68,6 +68,7 @@ typedef	unsigned int	__useconds_t;	/* microseconds (un
 typedef	int		__cpuwhich_t;	/* which parameter for cpuset. */
 typedef	int		__cpulevel_t;	/* level parameter for cpuset. */
 typedef int		__cpusetid_t;	/* cpuset identifier. */
+typedef __int64_t	__daddr_t;	/* bwrite(3), FIOBMAP2, etc */
 
 /*
  * Unusual type definitions.

Modified: head/sys/sys/filio.h
==============================================================================
--- head/sys/sys/filio.h	Fri Jun 21 21:44:31 2019	(r349279)
+++ head/sys/sys/filio.h	Fri Jun 21 21:50:14 2019	(r349280)
@@ -40,7 +40,7 @@
 #ifndef	_SYS_FILIO_H_
 #define	_SYS_FILIO_H_
 
-#include <sys/types.h>
+#include <sys/_types.h>
 #include <sys/ioccom.h>
 
 /* Generic file-descriptor ioctl's. */
@@ -64,12 +64,12 @@ struct fiodgname_arg {
 #define	FIOSEEKDATA	_IOWR('f', 97, off_t)	/* SEEK_DATA */
 #define	FIOSEEKHOLE	_IOWR('f', 98, off_t)	/* SEEK_HOLE */
 struct fiobmap2_arg {
-	int64_t	bn;
-	int	runp;
-	int	runb;
+	__daddr_t	bn;
+	int		runp;
+	int		runb;
 };
-/* Get the file's bmap info for the logical block bn */
-#define FIOBMAP2	_IOWR('f', 99, struct fiobmap2_arg)
+/* Get the file's bmap info for the logical block bn. */
+#define	FIOBMAP2	_IOWR('f', 99, struct fiobmap2_arg)
 
 #ifdef _KERNEL
 #ifdef COMPAT_FREEBSD32

Modified: head/sys/sys/types.h
==============================================================================
--- head/sys/sys/types.h	Fri Jun 21 21:44:31 2019	(r349279)
+++ head/sys/sys/types.h	Fri Jun 21 21:50:14 2019	(r349280)
@@ -101,7 +101,7 @@ typedef	__clockid_t	clockid_t;
 #endif
 
 typedef	__critical_t	critical_t;	/* Critical section value */
-typedef	__int64_t	daddr_t;	/* disk address */
+typedef	__daddr_t	daddr_t;	/* disk address */
 
 #ifndef _DEV_T_DECLARED
 typedef	__dev_t		dev_t;		/* device number or struct cdev */