d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ccd compile again after the Lite2 merge.

Browse Source 
VOP_UNLOCK was being called with the wrong number of arguments.
This commit is contained in:
mpp 1997-02-10 16:24:33 +00:00
parent 7d9b413ef6
commit 65726e4ca4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/ccd/ccd.c
View File

@ -1380,7 +1380,7 @@ ccdlookup(path, p, vpp)
vp = nd.ni_vp;
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (EBUSY);
}
@ -1390,14 +1390,14 @@ ccdlookup(path, p, vpp)
if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
printf("ccdlookup: getattr error = %d\n", error);
#endif
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (ENOTBLK);
}
@ -1407,7 +1407,7 @@ ccdlookup(path, p, vpp)
vprint("ccdlookup: vnode info", vp);
#endif
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
*vpp = vp;
return (0);
}

8
sys/geom/geom_ccd.c
View File

@ -1380,7 +1380,7 @@ ccdlookup(path, p, vpp)
vp = nd.ni_vp;
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (EBUSY);
}
@ -1390,14 +1390,14 @@ ccdlookup(path, p, vpp)
if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
printf("ccdlookup: getattr error = %d\n", error);
#endif
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
(void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
return (ENOTBLK);
}
@ -1407,7 +1407,7 @@ ccdlookup(path, p, vpp)
vprint("ccdlookup: vnode info", vp);
#endif
VOP_UNLOCK(vp);
VOP_UNLOCK(vp, 0, p);
*vpp = vp;
return (0);
}