diff options
| author | Attilio Rao <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
|---|---|---|
| committer | Attilio Rao <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
| commit | 81c794f9983314f28ba954fb5e8982c61eb43569 (patch) | |
| tree | d455fa541ca0d9b761f28e9c67c92fd959e44b2c /sys/fs/unionfs | |
| parent | c32951b16ee254477b29e0168a17b13f6fb2f5da (diff) | |
Notes
Diffstat (limited to 'sys/fs/unionfs')
| -rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 75ab212c87d6..4c566618f5b6 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -425,7 +425,7 @@ unionfs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) vp = ump->um_rootvp; UNIONFSDEBUG("unionfs_root: rootvp=%p locked=%x\n", - vp, VOP_ISLOCKED(vp, td)); + vp, VOP_ISLOCKED(vp)); vref(vp); if (flags & LK_TYPE_MASK) diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index b89808365b04..d0091507c331 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -278,7 +278,7 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (LK_SHARED == (cnp->cn_lkflags & LK_TYPE_MASK)) VOP_UNLOCK(vp, 0); - if (LK_EXCLUSIVE != VOP_ISLOCKED(vp, td)) { + if (LK_EXCLUSIVE != VOP_ISLOCKED(vp)) { vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); lockflag = 1; } @@ -528,7 +528,7 @@ unionfs_close(struct vop_close_args *ap) cred = ap->a_cred; td = ap->a_td; - if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(ap->a_vp) != LK_EXCLUSIVE) { vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); locked = 1; } @@ -1416,7 +1416,7 @@ unionfs_readdir(struct vop_readdir_args *ap) } /* check the open count. unionfs needs to open before readdir. */ - if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(ap->a_vp) != LK_EXCLUSIVE) { vn_lock(ap->a_vp, LK_UPGRADE | LK_RETRY); locked = 1; } |