diff options
author | attilio <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2008-02-25 18:45:57 +0000 |
commit | 4014b558307253555f43f360be60f49ea39b7ceb (patch) | |
tree | d455fa541ca0d9b761f28e9c67c92fd959e44b2c /sys/fs | |
parent | 49cb35343eeaa02f4e480228eb7148a3305d3b70 (diff) | |
download | FreeBSD-src-4014b558307253555f43f360be60f49ea39b7ceb.zip FreeBSD-src-4014b558307253555f43f360be60f49ea39b7ceb.tar.gz |
Axe the 'thread' argument from VOP_ISLOCKED() and lockstatus() as it is
always curthread.
As KPI gets broken by this patch, manpages and __FreeBSD_version will be
updated by further commits.
Tested by: Andrea Barberio <insomniac at slackware dot it>
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 2 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 6 | ||||
-rw-r--r-- | sys/fs/nullfs/null_vnops.c | 3 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 2 | ||||
-rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 24 | ||||
-rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 36 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/unionfs/union_vnops.c | 6 |
8 files changed, 40 insertions, 41 deletions
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index b08b9fa..3422986 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -360,7 +360,7 @@ devfs_close(struct vop_close_args *ap) } vholdl(vp); VI_UNLOCK(vp); - vp_locked = VOP_ISLOCKED(vp, td); + vp_locked = VOP_ISLOCKED(vp); VOP_UNLOCK(vp, 0); KASSERT(dev->si_refcount > 0, ("devfs_close() on un-referenced struct cdev *(%s)", devtoname(dev))); diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 95914f4..7c93dd9 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, curthread)) { + VOP_ISLOCKED(mp->mnt_vnodecovered)) { 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, curthread)) + if (isvnunlocked && !VOP_ISLOCKED(mp->mnt_vnodecovered)) 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, curthread)) + if (VOP_ISLOCKED(vp)) panic("root vnode is locked.\n"); #endif vn_lock(vp, flags | LK_RETRY); diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index d0193fc..ca7ed0c 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -619,9 +619,8 @@ static int null_islocked(struct vop_islocked_args *ap) { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; - return (lockstatus(vp->v_vnlock, td)); + return (lockstatus(vp->v_vnlock)); } /* diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 14ebdb7..163e722 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -203,7 +203,7 @@ smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred) return EFBIG;*/ td = uiop->uio_td; if (vp->v_type == VDIR) { - lks = LK_EXCLUSIVE;/*lockstatus(vp->v_vnlock, td);*/ + lks = LK_EXCLUSIVE; /* lockstatus(vp->v_vnlock); */ if (lks == LK_SHARED) vn_lock(vp, LK_UPGRADE | LK_RETRY); error = smbfs_readvdir(vp, uiop, cred); diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 0dadf8a..cc1b75f 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -414,7 +414,7 @@ unlock: out: *vpp = vp; - MPASS(IFF(error == 0, *vpp != NULL && VOP_ISLOCKED(*vpp, td))); + MPASS(IFF(error == 0, *vpp != NULL && VOP_ISLOCKED(*vpp))); #ifdef INVARIANTS TMPFS_NODE_LOCK(node); MPASS(*vpp == node->tn_vnode); @@ -466,7 +466,7 @@ tmpfs_alloc_file(struct vnode *dvp, struct vnode **vpp, struct vattr *vap, struct tmpfs_node *node; struct tmpfs_node *parent; - MPASS(VOP_ISLOCKED(dvp, cnp->cn_thread)); + MPASS(VOP_ISLOCKED(dvp)); MPASS(cnp->cn_flags & HASBUF); tmp = VFS_TO_TMPFS(dvp->v_mount); @@ -933,7 +933,7 @@ tmpfs_chflags(struct vnode *vp, int flags, struct ucred *cred, struct thread *p) int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -975,7 +975,7 @@ tmpfs_chflags(struct vnode *vp, int flags, struct ucred *cred, struct thread *p) } node->tn_status |= TMPFS_NODE_CHANGED; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); return 0; } @@ -993,7 +993,7 @@ tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p) int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -1033,7 +1033,7 @@ tmpfs_chmod(struct vnode *vp, mode_t mode, struct ucred *cred, struct thread *p) node->tn_status |= TMPFS_NODE_CHANGED; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); return 0; } @@ -1056,7 +1056,7 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, uid_t ouid; gid_t ogid; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -1106,7 +1106,7 @@ tmpfs_chown(struct vnode *vp, uid_t uid, gid_t gid, struct ucred *cred, node->tn_mode &= ~(S_ISUID | S_ISGID); } - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); return 0; } @@ -1125,7 +1125,7 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct ucred *cred, int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -1163,7 +1163,7 @@ tmpfs_chsize(struct vnode *vp, u_quad_t size, struct ucred *cred, /* tmpfs_truncate will raise the NOTE_EXTEND and NOTE_ATTRIB kevents * for us, as will update tn_status; no need to do that here. */ - MPASS(VOP_ISLOCKED(vp, p)); + MPASS(VOP_ISLOCKED(vp)); return error; } @@ -1182,7 +1182,7 @@ tmpfs_chtimes(struct vnode *vp, struct timespec *atime, struct timespec *mtime, int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, l)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -1217,7 +1217,7 @@ tmpfs_chtimes(struct vnode *vp, struct timespec *atime, struct timespec *mtime, if (birthtime->tv_nsec != VNOVAL && birthtime->tv_nsec != VNOVAL) node->tn_birthtime = *birthtime; - MPASS(VOP_ISLOCKED(vp, l)); + MPASS(VOP_ISLOCKED(vp)); return 0; } diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index a0b4b84..ff466ab 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -97,7 +97,7 @@ tmpfs_lookup(struct vop_cachedlookup_args *v) if (cnp->cn_flags & ISDOTDOT) { int ltype = 0; - ltype = VOP_ISLOCKED(dvp, td); + ltype = VOP_ISLOCKED(dvp); vhold(dvp); VOP_UNLOCK(dvp, 0); /* Allocate a new vnode on the matching entry. */ @@ -192,7 +192,7 @@ tmpfs_lookup(struct vop_cachedlookup_args *v) out: /* If there were no errors, *vpp cannot be null and it must be * locked. */ - MPASS(IFF(error == 0, *vpp != NULLVP && VOP_ISLOCKED(*vpp, td))); + MPASS(IFF(error == 0, *vpp != NULLVP && VOP_ISLOCKED(*vpp))); return error; } @@ -239,7 +239,7 @@ tmpfs_open(struct vop_open_args *v) int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -257,7 +257,7 @@ tmpfs_open(struct vop_open_args *v) vnode_create_vobject(vp, node->tn_size, v->a_td); } - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); return error; } @@ -270,7 +270,7 @@ tmpfs_close(struct vop_close_args *v) struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -295,7 +295,7 @@ tmpfs_access(struct vop_access_args *v) int error; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); @@ -334,7 +334,7 @@ tmpfs_access(struct vop_access_args *v) node->tn_gid, mode, cred, NULL); out: - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); return error; } @@ -394,7 +394,7 @@ tmpfs_setattr(struct vop_setattr_args *v) int error; - MPASS(VOP_ISLOCKED(vp, l)); + MPASS(VOP_ISLOCKED(vp)); error = 0; @@ -436,7 +436,7 @@ tmpfs_setattr(struct vop_setattr_args *v) * from tmpfs_update. */ tmpfs_update(vp); - MPASS(VOP_ISLOCKED(vp, l)); + MPASS(VOP_ISLOCKED(vp)); return error; } @@ -752,7 +752,7 @@ tmpfs_fsync(struct vop_fsync_args *v) { struct vnode *vp = v->a_vp; - MPASS(VOP_ISLOCKED(vp, v->a_td)); + MPASS(VOP_ISLOCKED(vp)); tmpfs_update(vp); @@ -773,8 +773,8 @@ tmpfs_remove(struct vop_remove_args *v) struct tmpfs_node *dnode; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp, v->a_cnp->cn_thread)); - MPASS(VOP_ISLOCKED(vp, v->a_cnp->cn_thread)); + MPASS(VOP_ISLOCKED(dvp)); + MPASS(VOP_ISLOCKED(vp)); if (vp->v_type == VDIR) { error = EISDIR; @@ -826,7 +826,7 @@ tmpfs_link(struct vop_link_args *v) struct tmpfs_dirent *de; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp, cnp->cn_thread)); + MPASS(VOP_ISLOCKED(dvp)); MPASS(cnp->cn_flags & HASBUF); MPASS(dvp != vp); /* XXX When can this be false? */ @@ -899,8 +899,8 @@ tmpfs_rename(struct vop_rename_args *v) struct tmpfs_node *tnode; struct tmpfs_node *tdnode; - MPASS(VOP_ISLOCKED(tdvp, tcnp->cn_thread)); - MPASS(IMPLIES(tvp != NULL, VOP_ISLOCKED(tvp, tcnp->cn_thread))); + MPASS(VOP_ISLOCKED(tdvp)); + MPASS(IMPLIES(tvp != NULL, VOP_ISLOCKED(tvp))); MPASS(fcnp->cn_flags & HASBUF); MPASS(tcnp->cn_flags & HASBUF); @@ -1105,8 +1105,8 @@ tmpfs_rmdir(struct vop_rmdir_args *v) struct tmpfs_node *dnode; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp, v->a_cnp->cn_thread)); - MPASS(VOP_ISLOCKED(vp, v->a_cnp->cn_thread)); + MPASS(VOP_ISLOCKED(dvp)); + MPASS(VOP_ISLOCKED(vp)); tmp = VFS_TO_TMPFS(dvp->v_mount); dnode = VP_TO_TMPFS_DIR(dvp); @@ -1314,7 +1314,7 @@ tmpfs_inactive(struct vop_inactive_args *v) struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(vp, l)); + MPASS(VOP_ISLOCKED(vp)); node = VP_TO_TMPFS_NODE(vp); diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 75ab212..4c56661 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 b898083..d009150 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; } |