diff options
| author | christos <christos@NetBSD.org> | 2018-03-31 23:12:01 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2018-03-31 23:12:01 +0000 |
| commit | ec462995c03cdebd26f79e319ecfe5b86cdd0796 (patch) | |
| tree | 6c826c11c4be964d537187c6d26b2297fdfb4a16 /sys/miscfs | |
| parent | f37b296df7bc2fc583b1e54264ae86ed2c74f211 (diff) | |
factor out some repeated code and simplify the logputchar function.
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/kernfs/kernfs_vnops.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c index e01918718aa..ba1c0def180 100644 --- a/sys/miscfs/kernfs/kernfs_vnops.c +++ b/sys/miscfs/kernfs/kernfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: kernfs_vnops.c,v 1.158 2017/05/26 14:21:01 riastradh Exp $ */ +/* $NetBSD: kernfs_vnops.c,v 1.159 2018/03/31 23:12:01 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.158 2017/05/26 14:21:01 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kernfs_vnops.c,v 1.159 2018/03/31 23:12:01 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -381,7 +381,7 @@ kernfs_xread(struct kernfs_node *kfs, int off, char **bufp, size_t len, size_t * * deal with cases where the message buffer has * become corrupted. */ - if (!msgbufenabled || msgbufp->msg_magic != MSG_MAGIC) { + if (!logenabled(msgbufp)) { msgbufenabled = 0; return (ENXIO); } @@ -942,8 +942,7 @@ kernfs_readdir(void *v) vrele(fvp); } if (kt->kt_tag == KFSmsgbuf) { - if (!msgbufenabled - || msgbufp->msg_magic != MSG_MAGIC) { + if (!logenabled(msgbufp)) { continue; } } |
