summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_gzio.c
diff options
context:
space:
mode:
authoralfred <alfred@FreeBSD.org>2010-04-30 03:10:53 +0000
committeralfred <alfred@FreeBSD.org>2010-04-30 03:10:53 +0000
commit20fdc94b9e6b94282e3e136276daf05c45b18edb (patch)
treed528bda8f3aa29f3c4e6500af9e456d80182d0dd /sys/kern/kern_gzio.c
parentc53b44ae5109b43866ee75858b45950f4870b2d5 (diff)
downloadFreeBSD-src-20fdc94b9e6b94282e3e136276daf05c45b18edb.zip
FreeBSD-src-20fdc94b9e6b94282e3e136276daf05c45b18edb.tar.gz
Do not set IO_NODELOCKED while writing to vnodes as our consumers
do not lock the vnodes. Obtained from: Juniper Networks Reviewed by: jhb
Diffstat (limited to 'sys/kern/kern_gzio.c')
-rw-r--r--sys/kern/kern_gzio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_gzio.c b/sys/kern/kern_gzio.c
index 1f9c387..c1b2b3f 100644
--- a/sys/kern/kern_gzio.c
+++ b/sys/kern/kern_gzio.c
@@ -166,7 +166,7 @@ gzFile gz_open (path, mode, vp)
0 /*xflags*/, OS_CODE);
if ((error = vn_rdwr(UIO_WRITE, s->file, buf, GZ_HEADER_LEN, s->outoff,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, curproc->p_ucred,
+ UIO_SYSSPACE, IO_UNIT, curproc->p_ucred,
NOCRED, &resid, curthread))) {
s->outoff += GZ_HEADER_LEN - resid;
return destroy(s), (gzFile)Z_NULL;
@@ -234,7 +234,7 @@ int ZEXPORT gzwrite (file, buf, len)
s->stream.next_out = s->outbuf;
vfslocked = VFS_LOCK_GIANT(s->file->v_mount);
error = vn_rdwr_inchunks(UIO_WRITE, s->file, s->outbuf, Z_BUFSIZE,
- curoff, UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT,
+ curoff, UIO_SYSSPACE, IO_UNIT,
curproc->p_ucred, NOCRED, &resid, curthread);
VFS_UNLOCK_GIANT(vfslocked);
if (error) {
@@ -291,7 +291,7 @@ local int do_flush (file, flush)
if (len != 0) {
vfslocked = VFS_LOCK_GIANT(s->file->v_mount);
error = vn_rdwr_inchunks(UIO_WRITE, s->file, s->outbuf, len, curoff,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, curproc->p_ucred,
+ UIO_SYSSPACE, IO_UNIT, curproc->p_ucred,
NOCRED, &resid, curthread);
VFS_UNLOCK_GIANT(vfslocked);
if (error) {
@@ -350,7 +350,7 @@ local void putU32 (s, x)
xx = x;
#endif
vn_rdwr(UIO_WRITE, s->file, (caddr_t)&xx, sizeof(xx), curoff,
- UIO_SYSSPACE, IO_NODELOCKED|IO_UNIT, curproc->p_ucred,
+ UIO_SYSSPACE, IO_UNIT, curproc->p_ucred,
NOCRED, &resid, curthread);
s->outoff += sizeof(xx) - resid;
}
OpenPOWER on IntegriCloud