LEASE_CHECK => VOP_LEASE

SCCS-vsn: sys/kern/kern_sig.c 8.9
SCCS-vsn: sys/kern/uipc_usrreq.c 8.4
SCCS-vsn: sys/kern/vfs_syscalls.c 8.20
SCCS-vsn: sys/kern/kern_exec.c 8.7
SCCS-vsn: sys/kern/kern_acct.c 8.5
SCCS-vsn: sys/kern/vfs_vnops.c 8.3

diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index 513bc65..06e6a8c 100644 (file)
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)kern_acct.c 8.4 (Berkeley) %G%
+ *     @(#)kern_acct.c 8.5 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -185,7 +185,7 @@ acct_process(p)
        else
                ap->ac_tty = NODEV;
        ap->ac_flag = p->p_acflag;
        else
                ap->ac_tty = NODEV;
        ap->ac_flag = p->p_acflag;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        return (vn_rdwr(UIO_WRITE, vp, (caddr_t)ap, sizeof (acctbuf), (off_t)0,
                UIO_SYSSPACE, IO_UNIT|IO_APPEND, p->p_ucred, (int *)0,
                (struct proc *)0));
        return (vn_rdwr(UIO_WRITE, vp, (caddr_t)ap, sizeof (acctbuf), (off_t)0,
                UIO_SYSSPACE, IO_UNIT|IO_APPEND, p->p_ucred, (int *)0,
                (struct proc *)0));

diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index f1e1c26..c9c3582 100644 (file)
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.proprietary.c%
  *
  *
  * %sccs.include.proprietary.c%
  *

- *     @(#)kern_exec.c 8.6 (Berkeley) %G%
+ *     @(#)kern_exec.c 8.7 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -93,7 +93,7 @@ execve(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, cred, LEASE_READ);
+       VOP_LEASE(vp, p, cred, LEASE_READ);

        VOP_LOCK(vp);
        indir = 0;
        uid = cred->cr_uid;
        VOP_LOCK(vp);
        indir = 0;
        uid = cred->cr_uid;


@@ -287,7 +287,7 @@ execve(p, uap, retval)
                if (error = namei(&nd))
                        return (error);
                vp = nd.ni_vp;
                if (error = namei(&nd))
                        return (error);
                vp = nd.ni_vp;

-               LEASE_CHECK(vp, p, cred, LEASE_READ);
+               VOP_LEASE(vp, p, cred, LEASE_READ);

                VOP_LOCK(vp);
                if (error = VOP_GETATTR(vp, &vattr, cred, p))
                        goto bad;
                VOP_LOCK(vp);
                if (error = VOP_GETATTR(vp, &vattr, cred, p))
                        goto bad;

diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index 9e5db75..7f28505 100644 (file)
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)kern_sig.c  8.8 (Berkeley) %G%
+ *     @(#)kern_sig.c  8.9 (Berkeley) %G%

  */
 
 #define        SIGPROP         /* include signal properties table */
  */
 
 #define        SIGPROP         /* include signal properties table */


@@ -1138,7 +1138,7 @@ coredump(p)
        }
        VATTR_NULL(&vattr);
        vattr.va_size = 0;
        }
        VATTR_NULL(&vattr);
        vattr.va_size = 0;

-       LEASE_CHECK(vp, p, cred, LEASE_WRITE);
+       VOP_LEASE(vp, p, cred, LEASE_WRITE);

        VOP_SETATTR(vp, &vattr, cred, p);
        p->p_acflag |= ACORE;
        bcopy(p, &p->p_addr->u_kproc.kp_proc, sizeof(struct proc));
        VOP_SETATTR(vp, &vattr, cred, p);
        p->p_acflag |= ACORE;
        bcopy(p, &p->p_addr->u_kproc.kp_proc, sizeof(struct proc));

diff --git a/usr/src/sys/kern/uipc_usrreq.c b/usr/src/sys/kern/uipc_usrreq.c
index d5c0029..26221f3 100644 (file)
--- a/usr/src/sys/kern/uipc_usrreq.c
+++ b/usr/src/sys/kern/uipc_usrreq.c
@@ -2,7 +2,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)uipc_usrreq.c       8.3 (Berkeley) %G%
+ *     @(#)uipc_usrreq.c       8.4 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -384,7 +384,7 @@ unp_bind(unp, nam, p)
        VATTR_NULL(&vattr);
        vattr.va_type = VSOCK;
        vattr.va_mode = ACCESSPERMS;
        VATTR_NULL(&vattr);
        vattr.va_type = VSOCK;
        vattr.va_mode = ACCESSPERMS;

-       LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

        if (error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr))
                return (error);
        vp = nd.ni_vp;
        if (error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr))
                return (error);
        vp = nd.ni_vp;

diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 055b5a5..c09915c 100644 (file)
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_syscalls.c      8.19 (Berkeley) %G%
+ *     @(#)vfs_syscalls.c      8.20 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -739,7 +739,7 @@ mknod(p, uap, retval)
                error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, CREATE);
                vput(nd.ni_dvp);
        } else if (!error) {
                error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, CREATE);
                vput(nd.ni_dvp);
        } else if (!error) {

-               LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+               VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

                error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                error = VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);


@@ -789,7 +789,7 @@ mkfifo(p, uap, retval)
        VATTR_NULL(&vattr);
        vattr.va_type = VFIFO;
        vattr.va_mode = (uap->mode & ALLPERMS) &~ p->p_fd->fd_cmask;
        VATTR_NULL(&vattr);
        vattr.va_type = VFIFO;
        vattr.va_mode = (uap->mode & ALLPERMS) &~ p->p_fd->fd_cmask;

-       LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

        return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
 #endif /* FIFO */
 }
        return (VOP_MKNOD(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr));
 #endif /* FIFO */
 }


@@ -825,10 +825,9 @@ link(p, uap, retval)
                        if (nd.ni_vp != NULL)
                                error = EEXIST;
                        if (!error) {
                        if (nd.ni_vp != NULL)
                                error = EEXIST;
                        if (!error) {

-                               LEASE_CHECK(nd.ni_dvp,
-                                   p, p->p_ucred, LEASE_WRITE);
-                               LEASE_CHECK(vp,
-                                   p, p->p_ucred, LEASE_WRITE);
+                               VOP_LEASE(nd.ni_dvp, p, p->p_ucred,
+                                   LEASE_WRITE);
+                               VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

                                error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
                        } else {
                                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                                error = VOP_LINK(nd.ni_dvp, vp, &nd.ni_cnd);
                        } else {
                                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);


@@ -883,7 +882,7 @@ symlink(p, uap, retval)
        }
        VATTR_NULL(&vattr);
        vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask;
        }
        VATTR_NULL(&vattr);
        vattr.va_mode = ACCESSPERMS &~ p->p_fd->fd_cmask;

-       LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

        error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path);
 out:
        FREE(path, M_NAMEI);
        error = VOP_SYMLINK(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr, path);
 out:
        FREE(path, M_NAMEI);


@@ -922,7 +921,7 @@ unwhiteout(p, uap, retval)
                return (EEXIST);
        }
 
                return (EEXIST);
        }
 

-       LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

        error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, DELETE);
        if (error != 0)
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
        error = VOP_WHITEOUT(nd.ni_dvp, &nd.ni_cnd, DELETE);
        if (error != 0)
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);


@@ -951,7 +950,7 @@ unlink(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
 
        if (vp->v_type != VDIR ||
        VOP_LOCK(vp);
 
        if (vp->v_type != VDIR ||


@@ -966,7 +965,7 @@ unlink(p, uap, retval)
        }
 
        if (!error) {
        }
 
        if (!error) {

-               LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+               VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

                error = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                error = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);


@@ -1365,7 +1364,7 @@ chflags(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1399,7 +1398,7 @@ fchflags(p, uap, retval)
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1434,7 +1433,7 @@ chmod(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1468,7 +1467,7 @@ fchmod(p, uap, retval)
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1504,7 +1503,7 @@ chown(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1540,7 +1539,7 @@ fchown(p, uap, retval)
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;
        if (error = getvnode(p->p_fd, uap->fd, &fp))
                return (error);
        vp = (struct vnode *)fp->f_data;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1584,7 +1583,7 @@ utimes(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;
        VOP_LOCK(vp);
        if (vp->v_mount->mnt_flag & MNT_RDONLY)
                error = EROFS;


@@ -1622,7 +1621,7 @@ truncate(p, uap, retval)
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;
        if (error = namei(&nd))
                return (error);
        vp = nd.ni_vp;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_type == VDIR)
                error = EISDIR;
        VOP_LOCK(vp);
        if (vp->v_type == VDIR)
                error = EISDIR;


@@ -1660,7 +1659,7 @@ ftruncate(p, uap, retval)
        if ((fp->f_flag & FWRITE) == 0)
                return (EINVAL);
        vp = (struct vnode *)fp->f_data;
        if ((fp->f_flag & FWRITE) == 0)
                return (EINVAL);
        vp = (struct vnode *)fp->f_data;

-       LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

        VOP_LOCK(vp);
        if (vp->v_type == VDIR)
                error = EISDIR;
        VOP_LOCK(vp);
        if (vp->v_type == VDIR)
                error = EISDIR;


@@ -1797,11 +1796,11 @@ rename(p, uap, retval)
                error = -1;
 out:
        if (!error) {
                error = -1;
 out:
        if (!error) {

-               LEASE_CHECK(tdvp, p, p->p_ucred, LEASE_WRITE);
+               VOP_LEASE(tdvp, p, p->p_ucred, LEASE_WRITE);

                if (fromnd.ni_dvp != tdvp)
                if (fromnd.ni_dvp != tdvp)

-                       LEASE_CHECK(fromnd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+                       VOP_LEASE(fromnd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

                if (tvp)
                if (tvp)

-                       LEASE_CHECK(tvp, p, p->p_ucred, LEASE_WRITE);
+                       VOP_LEASE(tvp, p, p->p_ucred, LEASE_WRITE);

                error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd,
                                   tond.ni_dvp, tond.ni_vp, &tond.ni_cnd);
        } else {
                error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd,
                                   tond.ni_dvp, tond.ni_vp, &tond.ni_cnd);
        } else {


@@ -1866,7 +1865,7 @@ mkdir(p, uap, retval)
        VATTR_NULL(&vattr);
        vattr.va_type = VDIR;
        vattr.va_mode = (uap->mode & ACCESSPERMS) &~ p->p_fd->fd_cmask;
        VATTR_NULL(&vattr);
        vattr.va_type = VDIR;
        vattr.va_mode = (uap->mode & ACCESSPERMS) &~ p->p_fd->fd_cmask;

-       LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+       VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);

        error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
        if (!error)
                vput(nd.ni_vp);
        error = VOP_MKDIR(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr);
        if (!error)
                vput(nd.ni_vp);


@@ -1913,8 +1912,8 @@ rmdir(p, uap, retval)
                error = EBUSY;
 out:
        if (!error) {
                error = EBUSY;
 out:
        if (!error) {

-               LEASE_CHECK(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
-               LEASE_CHECK(vp, p, p->p_ucred, LEASE_WRITE);
+               VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
+               VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);

                error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
                error = VOP_RMDIR(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd);
        } else {
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);

diff --git a/usr/src/sys/kern/vfs_vnops.c b/usr/src/sys/kern/vfs_vnops.c
index 9f81904..a6890e4 100644 (file)
--- a/usr/src/sys/kern/vfs_vnops.c
+++ b/usr/src/sys/kern/vfs_vnops.c
@@ -9,7 +9,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_vnops.c 8.2 (Berkeley) %G%
+ *     @(#)vfs_vnops.c 8.3 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -56,7 +56,7 @@ vn_open(ndp, fmode, cmode)
                        VATTR_NULL(vap);
                        vap->va_type = VREG;
                        vap->va_mode = cmode;
                        VATTR_NULL(vap);
                        vap->va_type = VREG;
                        vap->va_mode = cmode;

-                       LEASE_CHECK(ndp->ni_dvp, p, cred, LEASE_WRITE);
+                       VOP_LEASE(ndp->ni_dvp, p, cred, LEASE_WRITE);

                        if (error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp,
                            &ndp->ni_cnd, vap))
                                return (error);
                        if (error = VOP_CREATE(ndp->ni_dvp, &ndp->ni_vp,
                            &ndp->ni_cnd, vap))
                                return (error);


@@ -104,7 +104,7 @@ vn_open(ndp, fmode, cmode)
        }
        if (fmode & O_TRUNC) {
                VOP_UNLOCK(vp);                         /* XXX */
        }
        if (fmode & O_TRUNC) {
                VOP_UNLOCK(vp);                         /* XXX */

-               LEASE_CHECK(vp, p, cred, LEASE_WRITE);
+               VOP_LEASE(vp, p, cred, LEASE_WRITE);

                VOP_LOCK(vp);                                   /* XXX */
                VATTR_NULL(vap);
                vap->va_size = 0;
                VOP_LOCK(vp);                                   /* XXX */
                VATTR_NULL(vap);
                vap->va_size = 0;


@@ -225,7 +225,7 @@ vn_read(fp, uio, cred)
        register struct vnode *vp = (struct vnode *)fp->f_data;
        int count, error;
 
        register struct vnode *vp = (struct vnode *)fp->f_data;
        int count, error;
 

-       LEASE_CHECK(vp, uio->uio_procp, cred, LEASE_READ);
+       VOP_LEASE(vp, uio->uio_procp, cred, LEASE_READ);

        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
        count = uio->uio_resid;
        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
        count = uio->uio_resid;


@@ -251,7 +251,7 @@ vn_write(fp, uio, cred)
                ioflag |= IO_APPEND;
        if (fp->f_flag & FNONBLOCK)
                ioflag |= IO_NDELAY;
                ioflag |= IO_APPEND;
        if (fp->f_flag & FNONBLOCK)
                ioflag |= IO_NDELAY;

-       LEASE_CHECK(vp, uio->uio_procp, cred, LEASE_WRITE);
+       VOP_LEASE(vp, uio->uio_procp, cred, LEASE_WRITE);

        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
        count = uio->uio_resid;
        VOP_LOCK(vp);
        uio->uio_offset = fp->f_offset;
        count = uio->uio_resid;