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/tmpfs/tmpfs_subr.c | |
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/tmpfs/tmpfs_subr.c')
-rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 24 |
1 files changed, 12 insertions, 12 deletions
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; } |