aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs
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/contrib/openzfs
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/contrib/openzfs')
-rw-r--r--sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
index 4f2d7df87fc0..a537342f9678 100644
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c
@@ -102,12 +102,7 @@ SYSCTL_INT(_vfs_zfs_version, OID_AUTO, zpl, CTLFLAG_RD, &zfs_version_zpl, 0,
"ZPL_VERSION");
/* END CSTYLED */
-#if __FreeBSD_version >= 1400018
-static int zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg,
- bool *mp_busy);
-#else
static int zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg);
-#endif
static int zfs_mount(vfs_t *vfsp);
static int zfs_umount(vfs_t *vfsp, int fflag);
static int zfs_root(vfs_t *vfsp, int flags, vnode_t **vpp);
@@ -272,11 +267,7 @@ done:
}
static int
-#if __FreeBSD_version >= 1400018
-zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg, bool *mp_busy)
-#else
zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg)
-#endif
{
zfsvfs_t *zfsvfs = vfsp->vfs_data;
struct thread *td;
@@ -300,10 +291,8 @@ zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg)
break;
default:
error = EINVAL;
-#if __FreeBSD_version < 1400018
if (cmd == Q_QUOTAON || cmd == Q_QUOTAOFF)
vfs_unbusy(vfsp);
-#endif
goto done;
}
}
@@ -362,15 +351,11 @@ zfs_quotactl(vfs_t *vfsp, int cmds, uid_t id, void *arg)
case Q_QUOTAON:
// As far as I can tell, you can't turn quotas on or off on zfs
error = 0;
-#if __FreeBSD_version < 1400018
vfs_unbusy(vfsp);
-#endif
break;
case Q_QUOTAOFF:
error = ENOTSUP;
-#if __FreeBSD_version < 1400018
vfs_unbusy(vfsp);
-#endif
break;
case Q_SETQUOTA:
error = copyin(arg, &dqblk, sizeof (dqblk));