aboutsummaryrefslogtreecommitdiff
path: root/sys/sys
diff options
context:
space:
mode:
authorJason A. Harmening <jah@FreeBSD.org>2021-05-30 00:46:46 +0000
committerJason A. Harmening <jah@FreeBSD.org>2021-05-30 00:48:02 +0000
commit271fcf1c28efd22342212b1ccaa3dba4fc059627 (patch)
treee1fa6c2039bc9970ddf36f58aeb16002e2443345 /sys/sys
parent331a7601c9c21c1e55c57c5338e7affced9c7b7c (diff)
downloadsrc-271fcf1c28efd22342212b1ccaa3dba4fc059627.tar.gz
src-271fcf1c28efd22342212b1ccaa3dba4fc059627.zip
Revert commits 6d3e78ad6c11 and 54256e7954d7
Parts of libprocstat like to pretend they're kernel components for the sake of including mount.h, and including sys/types.h in the _KERNEL case doesn't fix the build for some reason. Revert both the VFS_QUOTACTL() change and the follow-up "fix" for now.
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/mount.h9
-rw-r--r--sys/sys/param.h2
2 files changed, 4 insertions, 7 deletions
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 6c1cd82ee84f..a1d4bfd15ddb 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -43,8 +43,6 @@
#include <sys/tslog.h>
#include <sys/_mutex.h>
#include <sys/_sx.h>
-#else
-#include <stdbool.h>
#endif
/*
@@ -761,8 +759,7 @@ struct mntarg;
typedef int vfs_cmount_t(struct mntarg *ma, void *data, uint64_t flags);
typedef int vfs_unmount_t(struct mount *mp, int mntflags);
typedef int vfs_root_t(struct mount *mp, int flags, struct vnode **vpp);
-typedef int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid, void *arg,
- bool *mp_busy);
+typedef int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid, void *arg);
typedef int vfs_statfs_t(struct mount *mp, struct statfs *sbp);
typedef int vfs_sync_t(struct mount *mp, int waitfor);
typedef int vfs_vget_t(struct mount *mp, ino_t ino, int flags,
@@ -835,10 +832,10 @@ vfs_statfs_t __vfs_statfs;
_rc = (*(MP)->mnt_op->vfs_cachedroot)(MP, FLAGS, VPP); \
_rc; })
-#define VFS_QUOTACTL(MP, C, U, A, MP_BUSY) ({ \
+#define VFS_QUOTACTL(MP, C, U, A) ({ \
int _rc; \
\
- _rc = (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, MP_BUSY); \
+ _rc = (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A); \
_rc; })
#define VFS_STATFS(MP, SBP) ({ \
diff --git a/sys/sys/param.h b/sys/sys/param.h
index c63452973daf..959f0b94ca70 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -76,7 +76,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1400018
+#define __FreeBSD_version 1400017
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,