summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_vnops.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2004-06-01 23:36:47 +0000
committerrwatson <rwatson@FreeBSD.org>2004-06-01 23:36:47 +0000
commit41a003003f0b0aaaf3db93125097339c84254b2d (patch)
treecc381a288a5c63aa6e25f2f276c7f145b03b6bf8 /sys/kern/vfs_vnops.c
parentda796b8f8e34a31cd1f427714647859523e2671e (diff)
downloadFreeBSD-src-41a003003f0b0aaaf3db93125097339c84254b2d.zip
FreeBSD-src-41a003003f0b0aaaf3db93125097339c84254b2d.tar.gz
Rather than assert f_type==DTYPE_VNODE, conditionally perform the
file lock release based on f_type==DTYPE_VNODE. vn_closefile() is used by non-vnode types as well (fifo).
Diffstat (limited to 'sys/kern/vfs_vnops.c')
-rw-r--r--sys/kern/vfs_vnops.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 2da4b6b..4091130 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -915,10 +915,9 @@ vn_closefile(fp, td)
GIANT_REQUIRED;
- KASSERT(fp->f_type == DTYPE_VNODE, ("vn_closefile: !DTYPE_VNODE"));
vp = fp->f_vnode;
- if (fp->f_flag & FHASLOCK) {
+ if (fp->f_type == DTYPE_VNODE && fp->f_flag & FHASLOCK) {
lf.l_whence = SEEK_SET;
lf.l_start = 0;
lf.l_len = 0;
OpenPOWER on IntegriCloud