diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-21 20:32:34 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-21 20:32:34 +0000 |
| commit | fa265a81a9a7e0727c780bd60e931cd6973f01e4 (patch) | |
| tree | 03e55dc350d7292bf6ae56b58e977250a9d76a81 /sys/dev/filemon/filemon.c | |
| parent | 37956f7289f74bc17547a3e4287eb211dd770ae0 (diff) | |
| download | FreeBSD-src-fa265a81a9a7e0727c780bd60e931cd6973f01e4.zip FreeBSD-src-fa265a81a9a7e0727c780bd60e931cd6973f01e4.tar.gz | |
MFC r300892,r300893,r301130,r301404,r301414,r301460:
r300892:
Rename function to be less generic.
r300893:
Don't truncate existing error when writing the log.
r301130:
Enable filemon on all architectures.
r301404:
Support all architectures by just using sysent.
r301414:
Fix build after r301404.
r301460:
Cleanup COMPAT_FREEBSD32 support.
Diffstat (limited to 'sys/dev/filemon/filemon.c')
| -rw-r--r-- | sys/dev/filemon/filemon.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c index 10f27ad..0020c54 100644 --- a/sys/dev/filemon/filemon.c +++ b/sys/dev/filemon/filemon.c @@ -54,16 +54,12 @@ __FBSDID("$FreeBSD$"); #include "filemon.h" -#if defined(COMPAT_IA32) || defined(COMPAT_FREEBSD32) || defined(COMPAT_ARCH32) +#if defined(COMPAT_FREEBSD32) #include <compat/freebsd32/freebsd32_syscall.h> #include <compat/freebsd32/freebsd32_proto.h> - -extern struct sysentvec ia32_freebsd_sysvec; +#include <compat/freebsd32/freebsd32_util.h> #endif -extern struct sysentvec elf32_freebsd_sysvec; -extern struct sysentvec elf64_freebsd_sysvec; - static d_close_t filemon_close; static d_ioctl_t filemon_ioctl; static d_open_t filemon_open; @@ -188,7 +184,7 @@ filemon_drop(struct filemon *filemon) #include "filemon_wrapper.c" static void -filemon_comment(struct filemon *filemon) +filemon_write_header(struct filemon *filemon) { int len; struct timeval now; @@ -377,7 +373,7 @@ filemon_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag __unused, &filemon->fp); if (error == 0) /* Write the file header. */ - filemon_comment(filemon); + filemon_write_header(filemon); break; /* Set the monitored process ID. */ |
