Author: imp
Date: Sun Mar 1 23:01:37 2020
New Revision: 358507
URL: https://svnweb.freebsd.org/changeset/base/358507
Log:
Remove stale FreeBSD_version checks.
Modified:
head/sys/nlm/nlm_prot_impl.c
Modified: head/sys/nlm/nlm_prot_impl.c
==============================================================================
--- head/sys/nlm/nlm_prot_impl.c Sun Mar 1 22:10:37 2020
(r358506)
+++ head/sys/nlm/nlm_prot_impl.c Sun Mar 1 23:01:37 2020
(r358507)
@@ -40,9 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/lockf.h>
#include <sys/malloc.h>
#include <sys/mount.h>
-#if __FreeBSD_version >= 700000
#include <sys/priv.h>
-#endif
#include <sys/proc.h>
#include <sys/socket.h>
#include <sys/socketvar.h>
@@ -1688,11 +1686,7 @@ sys_nlm_syscall(struct thread *td, struct nlm_syscall_
{
int error;
-#if __FreeBSD_version >= 700000
error = priv_check(td, PRIV_NFS_LOCKD);
-#else
- error = suser(td);
-#endif
if (error)
return (error);
@@ -1797,11 +1791,7 @@ nlm_get_vfs_state(struct nlm_host *host, struct svc_re
goto out;
}
-#if __FreeBSD_version < 800011
- VOP_UNLOCK(vs->vs_vp, 0, curthread);
-#else
VOP_UNLOCK(vs->vs_vp);
-#endif
vs->vs_vnlocked = FALSE;
out:
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
