diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 1999-08-12 20:38:32 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 1999-08-12 20:38:32 +0000 |
| commit | f4af31cb1c932fade5bf8febff06dc80f2f1d5a8 (patch) | |
| tree | e8154bda90cd43dd9ae420e67f89471337483f8c | |
| parent | a5813d5e8079d6fa8d054222f047b2bbfe092f79 (diff) | |
Notes
| -rw-r--r-- | sys/kern/vfs_extattr.c | 7 | ||||
| -rw-r--r-- | sys/kern/vfs_syscalls.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index bedf79fa2965..8d46d31d6f89 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.128 1999/08/04 04:52:18 imp Exp $ + * $Id: vfs_syscalls.c,v 1.129 1999/08/04 18:53:48 green Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -1020,8 +1020,9 @@ open(p, uap) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); fp->f_flag |= FHASLOCK; } - if (vn_canvmio(vp) == TRUE && vp->v_object == NULL) - vfs_object_create(vp, p, p->p_ucred); + /* assert that vn_open created a backing object if one is needed */ + KASSERT(!vn_canvmio(vp) || vp->v_object != NULL, + ("open: vmio vnode has no backing object after vn_open")); VOP_UNLOCK(vp, 0, p); p->p_retval[0] = indx; return (0); diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index bedf79fa2965..8d46d31d6f89 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.128 1999/08/04 04:52:18 imp Exp $ + * $Id: vfs_syscalls.c,v 1.129 1999/08/04 18:53:48 green Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -1020,8 +1020,9 @@ open(p, uap) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); fp->f_flag |= FHASLOCK; } - if (vn_canvmio(vp) == TRUE && vp->v_object == NULL) - vfs_object_create(vp, p, p->p_ucred); + /* assert that vn_open created a backing object if one is needed */ + KASSERT(!vn_canvmio(vp) || vp->v_object != NULL, + ("open: vmio vnode has no backing object after vn_open")); VOP_UNLOCK(vp, 0, p); p->p_retval[0] = indx; return (0); |