diff options
| author | attilio <attilio@FreeBSD.org> | 2008-02-08 21:45:47 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-02-08 21:45:47 +0000 |
| commit | e1db4e70b3e0f4dcd6006b5380fd6484833c54e5 (patch) | |
| tree | d665c82ab8f9928d1e59b948e716949fff3645b5 /sys/fs/nullfs/null_vfsops.c | |
| parent | a50bf6017b13b7c71ee735e11686a919ae329a41 (diff) | |
| download | FreeBSD-src-e1db4e70b3e0f4dcd6006b5380fd6484833c54e5.zip FreeBSD-src-e1db4e70b3e0f4dcd6006b5380fd6484833c54e5.tar.gz | |
Conver all explicit instances to VOP_ISLOCKED(arg, NULL) into
VOP_ISLOCKED(arg, curthread). Now, VOP_ISLOCKED() and lockstatus() should
only acquire curthread as argument; this will lead in axing the additional
argument from both functions, making the code cleaner.
Reviewed by: jeff, kib
Diffstat (limited to 'sys/fs/nullfs/null_vfsops.c')
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index e2e48dd..95914f4 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -107,7 +107,7 @@ nullfs_mount(struct mount *mp, struct thread *td) * (XXX) VOP_ISLOCKED is needed? */ if ((mp->mnt_vnodecovered->v_op == &null_vnodeops) && - VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) { + VOP_ISLOCKED(mp->mnt_vnodecovered, curthread)) { VOP_UNLOCK(mp->mnt_vnodecovered, 0); isvnunlocked = 1; } @@ -120,7 +120,7 @@ nullfs_mount(struct mount *mp, struct thread *td) /* * Re-lock vnode. */ - if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, NULL)) + if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered, curthread)) vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY); if (error) @@ -247,7 +247,7 @@ nullfs_root(mp, flags, vpp, td) VREF(vp); #ifdef NULLFS_DEBUG - if (VOP_ISLOCKED(vp, NULL)) + if (VOP_ISLOCKED(vp, curthread)) panic("root vnode is locked.\n"); #endif vn_lock(vp, flags | LK_RETRY); |
