aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/filio.h
diff options
context:
space:
mode:
authorAlan Somers <asomers@FreeBSD.org>2019-06-21 21:50:14 +0000
committerAlan Somers <asomers@FreeBSD.org>2019-06-21 21:50:14 +0000
commit1bb957296b3677de64b46de7832136b6bb5a2654 (patch)
tree4fa4d787b67710c9015237d101b1a549b7835c3c /sys/sys/filio.h
parentdb2114b4b885d490c84416af27ec50add8a354fd (diff)
downloadsrc-1bb957296b3677de64b46de7832136b6bb5a2654.tar.gz
src-1bb957296b3677de64b46de7832136b6bb5a2654.zip
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
Notes
Notes: svn path=/head/; revision=349280
Diffstat (limited to 'sys/sys/filio.h')
-rw-r--r--sys/sys/filio.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/sys/filio.h b/sys/sys/filio.h
index e85db9cff4d1..c5cf3d4432e9 100644
--- a/sys/sys/filio.h
+++ b/sys/sys/filio.h
@@ -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