d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce namespace pollution from r349233

Browse Source 
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
This commit is contained in:
asomers 2019-06-21 21:50:14 +00:00
parent 4c3575eb30
commit 4bfbbd74a8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/sys/_types.h
View File

@ -68,6 +68,7 @@ typedef unsigned int __useconds_t; /* microseconds (unsigned) */
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.

12
sys/sys/filio.h
View File

@ -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

2
sys/sys/types.h
View File

@ -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 */