diff options
author | kib <kib@FreeBSD.org> | 2014-07-28 01:04:33 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2014-07-28 01:04:33 +0000 |
commit | 8c4ee72725acbad63cc510d19fa695facef006ab (patch) | |
tree | 4b505c2a3405d955e79209c6d48201321be22049 | |
parent | 1a878ba1c0b17d23acf82ec3ec968d6895b35399 (diff) | |
download | FreeBSD-src-8c4ee72725acbad63cc510d19fa695facef006ab.zip FreeBSD-src-8c4ee72725acbad63cc510d19fa695facef006ab.tar.gz |
MFC r268609:
Add some assertions for the code handling vm_object for tmpfs vnode.
-rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 1 | ||||
-rw-r--r-- | sys/fs/tmpfs/tmpfs_vnops.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index ed1a3ff..e08c244 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -428,6 +428,7 @@ void tmpfs_destroy_vobject(struct vnode *vp, vm_object_t obj) { + ASSERT_VOP_ELOCKED(vp, "tmpfs_destroy_vobject"); if (vp->v_type != VREG || obj == NULL) return; diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 3586a28..8296ad10 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -258,6 +258,8 @@ tmpfs_open(struct vop_open_args *v) else { error = 0; /* For regular files, the call below is nop. */ + KASSERT(vp->v_type != VREG || (node->tn_reg.tn_aobj->flags & + OBJ_DEAD) == 0, ("dead object")); vnode_create_vobject(vp, node->tn_size, v->a_td); } |