diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2008-01-13 14:44:15 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2008-01-13 14:44:15 +0000 |
| commit | 22db15c06f1fbc66b47c8c931bbe291b9fd23d45 (patch) | |
| tree | 880b0acaab5ef09fe469c4b041d99ff26adca8b8 /sys/fs/cd9660 | |
| parent | ce4c63c52a45d7a3fc5c13b6c0a50fcece35a1f8 (diff) | |
| download | src-22db15c06f1fbc66b47c8c931bbe291b9fd23d45.tar.gz src-22db15c06f1fbc66b47c8c931bbe291b9fd23d45.zip | |
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>
Notes
Notes:
svn path=/head/; revision=175294
Diffstat (limited to 'sys/fs/cd9660')
| -rw-r--r-- | sys/fs/cd9660/cd9660_lookup.c | 3 | ||||
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index ddaf8dd6eaaa..9d87352d2489 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -115,7 +115,6 @@ cd9660_lookup(ap) struct componentname *cnp = ap->a_cnp; int flags = cnp->cn_flags; int nameiop = cnp->cn_nameiop; - struct thread *td = cnp->cn_thread; bp = NULL; *vpp = NULL; @@ -349,7 +348,7 @@ found: */ if (flags & ISDOTDOT) { saved_ino = dp->i_ino; - VOP_UNLOCK(pdp, 0, td); /* race to get the inode */ + VOP_UNLOCK(pdp, 0); /* race to get the inode */ error = cd9660_vget_internal(vdp->v_mount, saved_ino, LK_EXCLUSIVE, &tdp, saved_ino != ino, ep); diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index a63f3d6874d7..f4a370f53258 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -178,7 +178,7 @@ cd9660_mount(struct mount *mp, struct thread *td) vput(devvp); return (error); } - VOP_UNLOCK(devvp, 0, td); + VOP_UNLOCK(devvp, 0); if ((mp->mnt_flag & MNT_UPDATE) == 0) { error = iso_mountfs(devvp, mp, td); @@ -230,7 +230,7 @@ iso_mountfs(devvp, mp, td) error = g_vfs_open(devvp, &cp, "cd9660", 0); g_topology_unlock(); PICKUP_GIANT(); - VOP_UNLOCK(devvp, 0, td); + VOP_UNLOCK(devvp, 0); if (error) return error; if (devvp->v_rdev->si_iosize_max != 0) |