diff options
| author | attilio <attilio@FreeBSD.org> | 2008-01-13 14:44:15 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-01-13 14:44:15 +0000 |
| commit | 71b7824213151e91b40ee4afa9fa7f100c90ed0b (patch) | |
| tree | 880b0acaab5ef09fe469c4b041d99ff26adca8b8 /sys/i386/ibcs2 | |
| parent | 28827547bbae974e5ca23ee55d1ba558da366885 (diff) | |
| download | FreeBSD-src-71b7824213151e91b40ee4afa9fa7f100c90ed0b.zip FreeBSD-src-71b7824213151e91b40ee4afa9fa7f100c90ed0b.tar.gz | |
VOP_LOCK1() (and so VOP_LOCK()) and VOP_UNLOCK() are only used in
conjuction with 'thread' argument passing which is always curthread.
Remove the unuseful extra-argument and pass explicitly curthread to lower
layer functions, when necessary.
KPI results broken by this change, which should affect several ports, so
version bumping and manpage update will be further committed.
Tested by: kris, pho, Diego Sardina <siarodx at gmail dot com>
Diffstat (limited to 'sys/i386/ibcs2')
| -rw-r--r-- | sys/i386/ibcs2/ibcs2_misc.c | 4 | ||||
| -rw-r--r-- | sys/i386/ibcs2/imgact_coff.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 29ab8a2..18b6459 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -462,7 +462,7 @@ again: eof: td->td_retval[0] = uap->nbytes - resid; out: - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookies) @@ -628,7 +628,7 @@ again: eof: td->td_retval[0] = uap->nbytes - resid; out: - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); VFS_UNLOCK_GIANT(vfslocked); fdrop(fp, td); if (cookies) diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index d45ddde..348820c 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -211,7 +211,7 @@ coff_load_file(struct thread *td, char *name) * Lose the lock on the vnode. It's no longer needed, and must not * exist for the pagefault paging to work below. */ - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if ((error = vm_mmap(kernel_map, (vm_offset_t *) &ptr, @@ -285,7 +285,7 @@ coff_load_file(struct thread *td, char *name) panic("%s vm_map_remove failed", __func__); fail: - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); unlocked_fail: NDFREE(&nd, NDF_ONLY_PNBUF); vrele(nd.ni_vp); @@ -307,7 +307,6 @@ exec_coff_imgact(imgp) unsigned long data_offset = 0, data_address = 0, data_size = 0; unsigned long bss_size = 0; caddr_t hole; - struct thread *td = curthread; if (fhdr->f_magic != I386_COFF || !(fhdr->f_flags & F_EXEC)) { @@ -335,7 +334,7 @@ exec_coff_imgact(imgp) ((const char*)(imgp->image_header) + sizeof(struct filehdr) + sizeof(struct aouthdr)); - VOP_UNLOCK(imgp->vp, 0, td); + VOP_UNLOCK(imgp->vp, 0); error = exec_new_vmspace(imgp, &ibcs2_svr3_sysvec); if (error) |
