 @@ -1,14 +1,14 @@
-/*	$NetBSD: coda_vnops.c,v 1.109 2020/02/23 15:46:39 ad Exp $	*/
+/*	$NetBSD: coda_vnops.c,v 1.110 2020/02/24 20:53:11 ad Exp $	*/
 /*
+ *
  *             Coda: an Experimental Distributed File System
  *                              Release 3.1
+ *
  *           Copyright (c) 1987-1998 Carnegie Mellon University
  *                          All Rights Reserved
+ *
  * Permission  to  use, copy, modify and distribute this software and its
  * documentation is hereby granted,  provided  that  both  the  copyright
  * notice  and  this  permission  notice  appear  in  all  copies  of the
  * software, derivative works or  modified  versions,  and  any  portions
 @@ -36,27 +36,27 @@
  * Copyright (c) 1990 Carnegie-Mellon University
  * Copyright (c) 1989 Carnegie-Mellon University
  * All rights reserved.  The CMU software License Agreement specifies
  * the terms and conditions for use and redistribution.
  */
 /*
  * This code was written for the Coda file system at Carnegie Mellon
  * University.  Contributers include David Steere, James Kistler, and
  * M. Satyanarayanan.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.109 2020/02/23 15:46:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.110 2020/02/24 20:53:11 ad Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/errno.h>
 #include <sys/acct.h>
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/select.h>
 @@ -1879,66 +1879,68 @@ coda_getpages(void *v)
 		int *a_count;
 		int a_centeridx;
 		vm_prot_t a_access_type;
 		int a_advice;
 		int a_flags;
 	} */ *ap = v;
 	vnode_t *vp = ap->a_vp, *cvp;
 	struct cnode *cp = VTOC(vp);
 	struct lwp *l = curlwp;
 	kauth_cred_t cred = l->l_cred;
 	int error, cerror;
 	int waslocked;	       /* 1 if vnode lock was held on entry */
 	int didopen = 0;	/* 1 if we opened container file */
 	krw_t op;
 	/*
 	 * Handle a case that uvm_fault doesn't quite use yet.
 	 * See layer_vnops.c. for inspiration.
 	 */
 	if (ap->a_flags & PGO_LOCKED) {
 		return EBUSY;
+	}
-	KASSERT(mutex_owned(vp->v_interlock));
+	KASSERT(rw_lock_held(vp->v_uobj.vmobjlock));
 	/* Check for control object. */
 	if (IS_CTL_VP(vp)) {
 #ifdef CODA_VERBOSE
 		printf("%s: control object %p\n", __func__, vp);
 #endif
 		return(EINVAL);
+	}
 	/*
 	 * XXX It's really not ok to be releasing the lock we get,
 	 * because we could be overlapping with another call to
 	 * getpages and drop a lock they are relying on.  We need to
 	 * figure out whether getpages ever is called holding the
 	 * lock, and if we should serialize getpages calls by some
 	 * mechanism.
 	 */
 	/* XXX VOP_ISLOCKED() may not be used for lock decisions. */
 	op = rw_lock_op(vp->v_uobj.vmobjlock);
 	waslocked = VOP_ISLOCKED(vp);
 	/* Get container file if not already present. */
 	cvp = cp->c_ovp;
 	if (cvp == NULL) {
 		/*
 		 * VOP_OPEN requires a locked vnode.  We must avoid
 		 * locking the vnode if it is already locked, and
 		 * leave it in the same state on exit.
 		 */
 		if (waslocked == 0) {
-			mutex_exit(vp->v_interlock);
+			rw_exit(vp->v_uobj.vmobjlock);
 			cerror = vn_lock(vp, LK_EXCLUSIVE);
 			if (cerror) {
 #ifdef CODA_VERBOSE
 				printf("%s: can't lock vnode %p\n",
 				    __func__, vp);
 #endif
 				return cerror;
+			}
 #ifdef CODA_VERBOSE
 			printf("%s: locked vnode %p\n", __func__, vp);
 #endif
+		}
 @@ -1956,32 +1958,32 @@ coda_getpages(void *v)
 			    vp, cerror);
 #endif
 			if (waslocked == 0)
 				VOP_UNLOCK(vp);
 			return cerror;
+		}
 #ifdef CODA_VERBOSE
 		printf("%s: opened vnode %p\n", __func__, vp);
 #endif
 		cvp = cp->c_ovp;
 		didopen = 1;
 		if (waslocked == 0)
-			mutex_enter(vp->v_interlock);
+			rw_enter(vp->v_uobj.vmobjlock, op);
+	}
 	KASSERT(cvp != NULL);
 	/* Munge the arg structure to refer to the container vnode. */
-	KASSERT(cvp->v_interlock == vp->v_interlock);
+	KASSERT(cvp->v_uobj.vmobjlock == vp->v_uobj.vmobjlock);
 	ap->a_vp = cp->c_ovp;
 	/* Finally, call getpages on it. */
 	error = VCALL(ap->a_vp, VOFFSET(vop_getpages), ap);
 	/* If we opened the vnode, we must close it. */
 	if (didopen) {
 		/*
 		 * VOP_CLOSE requires a locked vnode, but we are still
 		 * holding the lock (or riding a caller's lock).
 		 */
 		cerror = VOP_CLOSE(vp, FREAD, cred);
 #ifdef CODA_VERBOSE
 @@ -2005,45 +2007,45 @@ coda_getpages(void *v)
 int
 coda_putpages(void *v)
+{
 	struct vop_putpages_args /* {
 		vnode_t *a_vp;
 		voff_t a_offlo;
 		voff_t a_offhi;
 		int a_flags;
 	} */ *ap = v;
 	vnode_t *vp = ap->a_vp, *cvp;
 	struct cnode *cp = VTOC(vp);
 	int error;
-	KASSERT(mutex_owned(vp->v_interlock));
+	KASSERT(rw_write_held(vp->v_uobj.vmobjlock));
 	/* Check for control object. */
 	if (IS_CTL_VP(vp)) {
-		mutex_exit(vp->v_interlock);
+		rw_exit(vp->v_uobj.vmobjlock);
 #ifdef CODA_VERBOSE
 		printf("%s: control object %p\n", __func__, vp);
 #endif
 		return 0;
+	}
 	/*
 	 * If container object is not present, then there are no pages
 	 * to put; just return without error.  This happens all the
 	 * time, apparently during discard of a closed vnode (which
 	 * trivially can't have dirty pages).
 	 */
 	cvp = cp->c_ovp;
 	if (cvp == NULL) {
-		mutex_exit(vp->v_interlock);
+		rw_exit(vp->v_uobj.vmobjlock);
 		return 0;
+	}
 	/* Munge the arg structure to refer to the container vnode. */
-	KASSERT(cvp->v_interlock == vp->v_interlock);
+	KASSERT(cvp->v_uobj.vmobjlock == vp->v_uobj.vmobjlock);
 	ap->a_vp = cvp;
 	/* Finally, call putpages on it. */
 	error = VCALL(ap->a_vp, VOFFSET(vop_putpages), ap);
 	return error;
+}