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
This commit is contained in:
parent
5a6ad7c5bc
commit
ce921ffca8
|
@ -40,7 +40,7 @@
|
||||||
#ifndef _SYS_FILIO_H_
|
#ifndef _SYS_FILIO_H_
|
||||||
#define _SYS_FILIO_H_
|
#define _SYS_FILIO_H_
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/_types.h>
|
||||||
#include <sys/ioccom.h>
|
#include <sys/ioccom.h>
|
||||||
|
|
||||||
/* Generic file-descriptor ioctl's. */
|
/* Generic file-descriptor ioctl's. */
|
||||||
|
@ -64,12 +64,12 @@ struct fiodgname_arg {
|
||||||
#define FIOSEEKDATA _IOWR('f', 97, off_t) /* SEEK_DATA */
|
#define FIOSEEKDATA _IOWR('f', 97, off_t) /* SEEK_DATA */
|
||||||
#define FIOSEEKHOLE _IOWR('f', 98, off_t) /* SEEK_HOLE */
|
#define FIOSEEKHOLE _IOWR('f', 98, off_t) /* SEEK_HOLE */
|
||||||
struct fiobmap2_arg {
|
struct fiobmap2_arg {
|
||||||
int64_t bn;
|
__daddr_t bn;
|
||||||
int runp;
|
int runp;
|
||||||
int runb;
|
int runb;
|
||||||
};
|
};
|
||||||
/* Get the file's bmap info for the logical block bn */
|
/* Get the file's bmap info for the logical block bn. */
|
||||||
#define FIOBMAP2 _IOWR('f', 99, struct fiobmap2_arg)
|
#define FIOBMAP2 _IOWR('f', 99, struct fiobmap2_arg)
|
||||||
|
|
||||||
#ifdef _KERNEL
|
#ifdef _KERNEL
|
||||||
#ifdef COMPAT_FREEBSD32
|
#ifdef COMPAT_FREEBSD32
|
||||||
|
|
Loading…
Reference in New Issue