Author: bdrewery
Date: Sat Mar 12 19:18:53 2016
New Revision: 296762
URL: https://svnweb.freebsd.org/changeset/base/296762
Log:
MFC r296148:
Remove old compatibility checks.
Modified:
stable/9/sys/dev/filemon/filemon.c
stable/9/sys/dev/filemon/filemon_wrapper.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/filemon/filemon.c
==============================================================================
--- stable/9/sys/dev/filemon/filemon.c Sat Mar 12 19:18:27 2016
(r296761)
+++ stable/9/sys/dev/filemon/filemon.c Sat Mar 12 19:18:53 2016
(r296762)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
#include <sys/file.h>
#include <sys/systm.h>
#include <sys/buf.h>
+#include <sys/capability.h>
#include <sys/condvar.h>
#include <sys/conf.h>
#include <sys/fcntl.h>
@@ -52,10 +53,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysproto.h>
#include <sys/uio.h>
-#if __FreeBSD_version >= 900041
-#include <sys/capability.h>
-#endif
-
#include "filemon.h"
#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
@@ -170,11 +167,7 @@ filemon_ioctl(struct cdev *dev, u_long c
break;
}
-#if __FreeBSD_version < 900041
-#define FGET_WRITE(a1, a2, a3) fget_write((a1), (a2), (a3))
-#else
#define FGET_WRITE(a1, a2, a3) fget_write((a1), (a2), CAP_WRITE | CAP_SEEK,
(a3))
-#endif
if ((error = FGET_WRITE(td, *(int *)data, &filemon->fp)) == 0)
/* Write the file header. */
filemon_comment(filemon);
Modified: stable/9/sys/dev/filemon/filemon_wrapper.c
==============================================================================
--- stable/9/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:18:27 2016
(r296761)
+++ stable/9/sys/dev/filemon/filemon_wrapper.c Sat Mar 12 19:18:53 2016
(r296762)
@@ -36,27 +36,6 @@ __FBSDID("$FreeBSD$");
#include "opt_compat.h"
-#if __FreeBSD_version > 800032
-#define FILEMON_HAS_LINKAT
-#endif
-
-#if __FreeBSD_version < 900044 /* r225617 (2011-09-16) failed to bump
- __FreeBSD_version. This really should
- be based on "900045". "900044" is r225469
- (2011-09-10) so this code is broken for
- 9-CURRENT September 10th-16th. */
-#define sys_chdir chdir
-#define sys_link link
-#define sys_open open
-#define sys_rename rename
-#define sys_stat stat
-#define sys_symlink symlink
-#define sys_unlink unlink
-#ifdef FILEMON_HAS_LINKAT
-#define sys_linkat linkat
-#endif
-#endif /* __FreeBSD_version */
-
static eventhandler_tag filemon_exec_tag;
static eventhandler_tag filemon_exit_tag;
static eventhandler_tag filemon_fork_tag;
@@ -341,7 +320,6 @@ filemon_wrapper_symlink(struct thread *t
return (ret);
}
-#ifdef FILEMON_HAS_LINKAT
static int
filemon_wrapper_linkat(struct thread *td, struct linkat_args *uap)
{
@@ -369,7 +347,6 @@ filemon_wrapper_linkat(struct thread *td
return (ret);
}
-#endif
static int
filemon_wrapper_stat(struct thread *td, struct stat_args *uap)
@@ -520,9 +497,7 @@ filemon_wrapper_install(void)
sv_table[SYS_unlink].sy_call = (sy_call_t *) filemon_wrapper_unlink;
sv_table[SYS_link].sy_call = (sy_call_t *) filemon_wrapper_link;
sv_table[SYS_symlink].sy_call = (sy_call_t *) filemon_wrapper_symlink;
-#ifdef FILEMON_HAS_LINKAT
sv_table[SYS_linkat].sy_call = (sy_call_t *) filemon_wrapper_linkat;
-#endif
#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
sv_table = ia32_freebsd_sysvec.sv_table;
@@ -535,9 +510,7 @@ filemon_wrapper_install(void)
sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *)
filemon_wrapper_unlink;
sv_table[FREEBSD32_SYS_link].sy_call = (sy_call_t *)
filemon_wrapper_link;
sv_table[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *)
filemon_wrapper_symlink;
-#ifdef FILEMON_HAS_LINKAT
sv_table[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *)
filemon_wrapper_linkat;
-#endif
#endif /* COMPAT_ARCH32 */
filemon_exec_tag = EVENTHANDLER_REGISTER(process_exec,
@@ -567,9 +540,7 @@ filemon_wrapper_deinstall(void)
sv_table[SYS_unlink].sy_call = (sy_call_t *)sys_unlink;
sv_table[SYS_link].sy_call = (sy_call_t *)sys_link;
sv_table[SYS_symlink].sy_call = (sy_call_t *)sys_symlink;
-#ifdef FILEMON_HAS_LINKAT
sv_table[SYS_linkat].sy_call = (sy_call_t *)sys_linkat;
-#endif
#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32)
sv_table = ia32_freebsd_sysvec.sv_table;
@@ -582,9 +553,7 @@ filemon_wrapper_deinstall(void)
sv_table[FREEBSD32_SYS_unlink].sy_call = (sy_call_t *)sys_unlink;
sv_table[FREEBSD32_SYS_link].sy_call = (sy_call_t *)sys_link;
sv_table[FREEBSD32_SYS_symlink].sy_call = (sy_call_t *)sys_symlink;
-#ifdef FILEMON_HAS_LINKAT
sv_table[FREEBSD32_SYS_linkat].sy_call = (sy_call_t *)sys_linkat;
-#endif
#endif /* COMPAT_ARCH32 */
EVENTHANDLER_DEREGISTER(process_exec, filemon_exec_tag);
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
