diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-15 08:43:12 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-15 08:43:12 -0300 |
| commit | 36dc79e340ad62cb5cb2aedeb0698497a36edc3e (patch) | |
| tree | b23a0607482f711ef5b13cca8cc524d718c3a19a /lib/libc | |
| parent | 73d5c51ae134057fcd0c7d4d2d565e635ddc058a (diff) | |
| parent | 0fe8ad6bc5e70f4f6b604c03c315c75236b4dd57 (diff) | |
| download | FreeBSD-src-36dc79e340ad62cb5cb2aedeb0698497a36edc3e.zip FreeBSD-src-36dc79e340ad62cb5cb2aedeb0698497a36edc3e.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/db/hash/hash.c | 3 | ||||
| -rw-r--r-- | lib/libc/sys/ktrace.2 | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index 333b1a1..12220a9 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -423,7 +423,8 @@ hdestroy(HTAB *hashp) free(hashp->tmp_buf); if (hashp->fp != -1) { - (void)_fsync(hashp->fp); + if (hashp->save_file) + (void)_fsync(hashp->fp); (void)_close(hashp->fp); } diff --git a/lib/libc/sys/ktrace.2 b/lib/libc/sys/ktrace.2 index 4e5d92a..b02a672 100644 --- a/lib/libc/sys/ktrace.2 +++ b/lib/libc/sys/ktrace.2 @@ -28,7 +28,7 @@ .\" @(#)ktrace.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd October 10, 2011 +.Dd March 31, 2016 .Dt KTRACE 2 .Os .Sh NAME @@ -94,6 +94,8 @@ generate much output). .It KTRFAC_PROCCTOR Ta "Trace process construction." .It KTRFAC_PROCDTOR Ta "Trace process destruction." .It KTRFAC_CAPFAIL Ta "Trace capability failures." +.It KTRFAC_FAULT Ta "Trace page faults." +.It KTRFAC_FAULTEND Ta "Trace the end of page faults." .It KTRFAC_INHERIT Ta "Inherit tracing to future children." .El .Pp |
