Ditch vfs_object_create() and make the callers call VOP_CREATEVOBJECT()

directly.

4 files changed, 14 insertions, 15 deletions

diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 8fe503b..19953e1 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -140,9 +140,9 @@ printf("coda_getp: Internally Opening %p\n", vp);
 		return (error);
 	}
 	if (vp->v_type == VREG) {
-	    error = vfs_object_create(vp, p, cred);
+	    error = VOP_CREATEVOBJECT(vp, cred, p);
 	    if (error != 0) {
-		printf("coda_getpage: vfs_object_create() returns %d\n", error);
+		printf("coda_getpage: VOP_CREATEVOBJECT() returns %d\n", error);
 		vput(vp);
 		return(error);
 	    }
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index 71b6976..9509115 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -267,9 +267,9 @@ coda_open(struct vop_open_args *ap)
     }
 /* grab (above) does this when it calls newvnode unless it's in the cache*/
     if (vp->v_type == VREG) {
-    	error = vfs_object_create(vp, td, cred);
+    	error = VOP_CREATEVOBJECT(vp, cred, td);
 	if (error != 0) {
-	    printf("coda_open: vfs_object_create() returns %d\n", error);
+	    printf("coda_open: VOP_CREATEVOBJECT() returns %d\n", error);
 	    vput(vp);
 	}
     }
@@ -432,9 +432,9 @@ printf("coda_rdwr: Internally Opening %p\n", vp);
 		return (error);
 	    }
 	    if (vp->v_type == VREG) {
-		error = vfs_object_create(vp, td, cred);
+		error = VOP_CREATEVOBJECT(vp, cred, td);
 		if (error != 0) {
-		    printf("coda_rdwr: vfs_object_create() returns %d\n", error);
+		    printf("coda_rdwr: VOP_CREATEVOBJECT() returns %d\n", error);
 		    vput(vp);
 		}
 	    }
@@ -1563,9 +1563,9 @@ printf("coda_readdir: Internally Opening %p\n", vp);
 		return (error);
 	    }
 	    if (vp->v_type == VREG) {
-		error = vfs_object_create(vp, td, cred);
+		error = VOP_CREATEVOBJECT(vp, cred, td);
 		if (error != 0) {
-		    printf("coda_readdir: vfs_object_create() returns %d\n", error);
+		    printf("coda_readdir: VOP_CREATEVOBJECT() returns %d\n", error);
 		    vput(vp);
 		}
 	    }
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index bcd39d9..78a469b 100644
--- a/sys/fs/unionfs/union_subr.c
+++ b/sys/fs/unionfs/union_subr.c
@@ -782,7 +782,7 @@ union_copyup(un, docopy, cred, td)
 		vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY, td);
 		error = VOP_OPEN(lvp, FREAD, cred, td, -1);
 		if (error == 0 && vn_canvmio(lvp) == TRUE)
-			error = vfs_object_create(lvp, td, cred);
+			error = VOP_CREATEVOBJECT(lvp, cred, td);
 		if (error == 0) {
 			error = union_copyfile(lvp, uvp, cred, td);
 			VOP_UNLOCK(lvp, 0, td);
@@ -815,7 +815,7 @@ union_copyup(un, docopy, cred, td)
 		}
 		if (un->un_openl) {
 			if (vn_canvmio(uvp) == TRUE)
-				error = vfs_object_create(uvp, td, cred);
+				error = VOP_CREATEVOBJECT(uvp, cred, td);
 		}
 		un->un_openl = 0;
 	}
@@ -1128,7 +1128,7 @@ union_vn_create(vpp, un, td)
 
 	error = VOP_OPEN(vp, fmode, cred, td, -1);
 	if (error == 0 && vn_canvmio(vp) == TRUE)
-		error = vfs_object_create(vp, td, cred);
+		error = VOP_CREATEVOBJECT(vp, cred, td);
 	if (error) {
 		vput(vp);
 		return (error);
@@ -1331,7 +1331,7 @@ union_dircheck(struct thread *td, struct vnode **vp, struct file *fp)
 		if (lvp != NULLVP) {
 			error = VOP_OPEN(lvp, FREAD, fp->f_cred, td, -1);
 			if (error == 0 && vn_canvmio(lvp) == TRUE)
-				error = vfs_object_create(lvp, td, fp->f_cred);
+				error = VOP_CREATEVOBJECT(lvp, fp->f_cred, td);
 			if (error) {
 				vput(lvp);
 				return (error);
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index 2dcfd2d..94df922 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -785,9 +785,8 @@ union_open(ap)
 	/*
 	 * This is absolutely necessary or UFS will blow up.
 	 */
-        if (error == 0 && vn_canvmio(tvp) == TRUE) {
-                error = vfs_object_create(tvp, td, cred);
-        }
+        if (error == 0 && vn_canvmio(tvp) == TRUE)
+                error = VOP_CREATEVOBJECT(tvp, cred, td);
 
 	/*
 	 * Release any locks held.