Merge branch 'master' into kiconv2
[dragonfly.git] / sys / vfs / isofs / cd9660 / cd9660_vfsops.c
index d7c04e4..9c09c56 100644 (file)
@@ -121,13 +121,15 @@ iso_get_ssector(cdev_t dev)
        struct ioc_read_toc_single_entry t;
        int i;
 
-       if (dev_dioctl(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD, proc0.p_ucred) != 0)
+       if (dev_dioctl(dev, CDIOREADTOCHEADER, (caddr_t)&h, FREAD,
+                      proc0.p_ucred, NULL) != 0)
                return 0;
 
        for (i = h.ending_track; i >= 0; i--) {
                t.address_format = CD_LBA_FORMAT;
                t.track = i;
-               if (dev_dioctl(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD, proc0.p_ucred) != 0) {
+               if (dev_dioctl(dev, CDIOREADTOCENTRY, (caddr_t)&t, FREAD,
+                              proc0.p_ucred, NULL) != 0) {
                        return 0;
                }
                if ((t.entry.control & 4) != 0)
@@ -233,7 +235,7 @@ cd9660_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred)
         */
        accessmode = VREAD;
        vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY);
-       error = VOP_ACCESS(devvp, accessmode, cred);
+       error = VOP_EACCESS(devvp, accessmode, cred);
        if (error) 
                error = priv_check_cred(cred, PRIV_ROOT, 0);
        if (error) {
@@ -297,7 +299,7 @@ iso_mountfs(struct vnode *devvp, struct mount *mp, struct iso_args *argp)
         */
        if ((error = vfs_mountedon(devvp)))
                return error;
-       if (count_udev(devvp->v_umajor, devvp->v_uminor) > 0)
+       if (vcount(devvp) > 0)
                return EBUSY;
        if ((error = vinvalbuf(devvp, V_SAVE, 0, 0)))
                return (error);