From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sat, 9 May 2015 22:45:08 +0000 (+0900)
Subject: sys/sys: Rename VFS_MPLOCK1 to VFS_MPLOCK
X-Git-Tag: v4.2.0rc~203
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/371cb095cfbd4be09a76849d9b9ad961d5001e84

sys/sys: Rename VFS_MPLOCK1 to VFS_MPLOCK

- The previous commit has removed VFS_MPLOCK2 macro.

- VFS_MPLOCK1 is the only VFS_MPLOCK* macro now, so strip '1'
  from VFS_MPLOCK1. It's confusing with '1' since VFS_MPUNLOCK
  has no '1' as well with no numbered variants.
---

diff --git a/sys/kern/vfs_vfsops.c b/sys/kern/vfs_vfsops.c
index 51503477e4..cb68f0d552 100644
--- a/sys/kern/vfs_vfsops.c
+++ b/sys/kern/vfs_vfsops.c
@@ -89,7 +89,7 @@ vfs_mount(struct mount *mp, char *path, caddr_t data, struct ucred *cred)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_mount)(mp, path, data, cred);
 	VFS_MPUNLOCK(mp);
 
@@ -128,7 +128,7 @@ vfs_unmount(struct mount *mp, int mntflags)
 	int error;
 	int flags;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	VFS_ACDONE(mp);
 	flags = mp->mnt_kern_flag;
 	error = (mp->mnt_op->vfs_unmount)(mp, mntflags);
@@ -147,7 +147,7 @@ vfs_root(struct mount *mp, struct vnode **vpp)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_root)(mp, vpp);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -163,7 +163,7 @@ vfs_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t arg,
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_quotactl)(mp, cmds, uid, arg, cred);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -178,7 +178,7 @@ vfs_statfs(struct mount *mp, struct statfs *sbp, struct ucred *cred)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_statfs)(mp, sbp, cred);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -190,7 +190,7 @@ vfs_statvfs(struct mount *mp, struct statvfs *sbp, struct ucred *cred)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_statvfs)(mp, sbp, cred);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -205,7 +205,7 @@ vfs_sync(struct mount *mp, int waitfor)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_sync)(mp, waitfor);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -220,7 +220,7 @@ vfs_vget(struct mount *mp, struct vnode *dvp, ino_t ino, struct vnode **vpp)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_vget)(mp, dvp, ino, vpp);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -236,7 +236,7 @@ vfs_fhtovp(struct mount *mp, struct vnode *rootvp,
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_fhtovp)(mp, rootvp, fhp, vpp);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -252,7 +252,7 @@ vfs_checkexp(struct mount *mp, struct sockaddr *nam,
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_checkexp)(mp, nam, extflagsp, credanonp);
 	VFS_MPUNLOCK(mp);
 	return (error);
@@ -267,7 +267,7 @@ vfs_vptofh(struct vnode *vp, struct fid *fhp)
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	error = (vp->v_mount->mnt_op->vfs_vptofh)(vp, fhp);
 	VFS_MPUNLOCK(vp->v_mount);
 	return (error);
@@ -314,7 +314,7 @@ vfs_extattrctl(struct mount *mp, int cmd, struct vnode *vp,
 	VFS_MPLOCK_DECLARE;
 	int error;
 
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	error = (mp->mnt_op->vfs_extattrctl)(mp, cmd, vp,
 					     attrnamespace, attrname,
 					     cred);
diff --git a/sys/kern/vfs_vopops.c b/sys/kern/vfs_vopops.c
index e67057fce4..87b3eea13f 100644
--- a/sys/kern/vfs_vopops.c
+++ b/sys/kern/vfs_vopops.c
@@ -162,7 +162,7 @@ VNODEOP_DESC_INIT(nrename);
  *	 vop_old_*().  Only the code in vfs_default.c is allowed to call
  *	 those ops.
  *
- * NOTE: The VFS_MPLOCK1() macro handle mounts which do not set MNTK_MPSAFE.
+ * NOTE: The VFS_MPLOCK() macro handle mounts which do not set MNTK_MPSAFE.
  *
  * MPSAFE
  */
@@ -180,7 +180,7 @@ vop_old_lookup(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_dvp = dvp;
 	ap.a_vpp = vpp;
 	ap.a_cnp = cnp;
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_lookup);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -204,7 +204,7 @@ vop_old_create(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_cnp = cnp;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_create);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -227,7 +227,7 @@ vop_old_whiteout(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_cnp = cnp;
 	ap.a_flags = flags;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_whiteout);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -251,7 +251,7 @@ vop_old_mknod(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_cnp = cnp;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_mknod);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -285,7 +285,7 @@ vop_open(struct vop_ops *ops, struct vnode *vp, int mode, struct ucred *cred,
 	ap.a_mode = mode;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_open);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -308,7 +308,7 @@ vop_close(struct vop_ops *ops, struct vnode *vp, int fflag,
 	ap.a_fp = fp;
 	ap.a_fflag = fflag;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_close);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -332,7 +332,7 @@ vop_access(struct vop_ops *ops, struct vnode *vp, int mode, int flags,
 	ap.a_flags = flags;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_access);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -377,7 +377,7 @@ vop_setattr(struct vop_ops *ops, struct vnode *vp, struct vattr *vap,
 	ap.a_vap = vap;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_setattr);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -482,7 +482,7 @@ vop_ioctl(struct vop_ops *ops, struct vnode *vp, u_long command, caddr_t data,
 	ap.a_cred = cred;
 	ap.a_sysmsg = msg;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_ioctl);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -504,7 +504,7 @@ vop_poll(struct vop_ops *ops, struct vnode *vp, int events, struct ucred *cred)
 	ap.a_events = events;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_poll);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -525,7 +525,7 @@ vop_kqfilter(struct vop_ops *ops, struct vnode *vp, struct knote *kn)
 	ap.a_vp = vp;
 	ap.a_kn = kn;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_kqfilter);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -547,7 +547,7 @@ vop_mmap(struct vop_ops *ops, struct vnode *vp, int fflags, struct ucred *cred)
 	ap.a_fflags = fflags;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_mmap);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -569,7 +569,7 @@ vop_fsync(struct vop_ops *ops, struct vnode *vp, int waitfor, int flags)
 	ap.a_waitfor = waitfor;
 	ap.a_flags = flags;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_fsync);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -592,7 +592,7 @@ vop_old_remove(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_vp = vp;
 	ap.a_cnp = cnp;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_remove);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -615,7 +615,7 @@ vop_old_link(struct vop_ops *ops, struct vnode *tdvp,
 	ap.a_vp = vp;
 	ap.a_cnp = cnp;
 
-	VFS_MPLOCK1(tdvp->v_mount);
+	VFS_MPLOCK(tdvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_link);
 	VFS_MPUNLOCK(tdvp->v_mount);
 	return(error);
@@ -642,7 +642,7 @@ vop_old_rename(struct vop_ops *ops,
 	ap.a_tvp = tvp;
 	ap.a_tcnp = tcnp;
 
-	VFS_MPLOCK1(tdvp->v_mount);
+	VFS_MPLOCK(tdvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_rename);
 	VFS_MPUNLOCK(tdvp->v_mount);
 	return(error);
@@ -666,7 +666,7 @@ vop_old_mkdir(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_cnp = cnp;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_mkdir);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -689,7 +689,7 @@ vop_old_rmdir(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_vp = vp;
 	ap.a_cnp = cnp;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_rmdir);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -715,7 +715,7 @@ vop_old_symlink(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_vap = vap;
 	ap.a_target = target;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_old_symlink);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -741,7 +741,7 @@ vop_readdir(struct vop_ops *ops, struct vnode *vp, struct uio *uio,
 	ap.a_ncookies = ncookies;
 	ap.a_cookies = cookies;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_readdir);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -764,7 +764,7 @@ vop_readlink(struct vop_ops *ops, struct vnode *vp, struct uio *uio,
 	ap.a_uio = uio;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_readlink);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -815,7 +815,7 @@ vop_reclaim(struct vop_ops *ops, struct vnode *vp)
 	 * WARNING!  Reclamation of the vnode will clear vp->v_mount.
 	 */
 	mp = vp->v_mount;
-	VFS_MPLOCK1(mp);
+	VFS_MPLOCK(mp);
 	DO_OPS(ops, error, &ap, vop_reclaim);
 	VFS_MPUNLOCK(mp);
 	return(error);
@@ -841,7 +841,7 @@ vop_bmap(struct vop_ops *ops, struct vnode *vp, off_t loffset,
 	ap.a_runb = runb;
 	ap.a_cmd = cmd;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_bmap);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -889,7 +889,7 @@ vop_print(struct vop_ops *ops, struct vnode *vp)
 	ap.a_head.a_ops = ops;
 	ap.a_vp = vp;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_print);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -912,7 +912,7 @@ vop_pathconf(struct vop_ops *ops, struct vnode *vp, int name,
 	ap.a_name = name;
 	ap.a_retval = retval;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_pathconf);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -937,7 +937,7 @@ vop_advlock(struct vop_ops *ops, struct vnode *vp, caddr_t id, int op,
 	ap.a_fl = fl;
 	ap.a_flags = flags;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_advlock);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -964,7 +964,7 @@ vop_balloc(struct vop_ops *ops, struct vnode *vp, off_t startoffset,
 	ap.a_flags = flags;
 	ap.a_bpp = bpp;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_balloc);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -986,7 +986,7 @@ vop_reallocblks(struct vop_ops *ops, struct vnode *vp,
 	ap.a_vp = vp;
 	ap.a_buflist = buflist;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_reallocblks);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1012,7 +1012,7 @@ vop_getpages(struct vop_ops *ops, struct vnode *vp, vm_page_t *m, int count,
 	ap.a_offset = offset;
 	ap.a_seqaccess = seqaccess;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_getpages);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1038,7 +1038,7 @@ vop_putpages(struct vop_ops *ops, struct vnode *vp, vm_page_t *m, int count,
 	ap.a_rtvals = rtvals;
 	ap.a_offset = offset;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_putpages);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1060,7 +1060,7 @@ vop_freeblks(struct vop_ops *ops, struct vnode *vp, off_t offset, int length)
 	ap.a_offset = offset;
 	ap.a_length = length;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_freeblks);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1084,7 +1084,7 @@ vop_getacl(struct vop_ops *ops, struct vnode *vp, acl_type_t type,
 	ap.a_aclp = aclp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_getacl);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1108,7 +1108,7 @@ vop_setacl(struct vop_ops *ops, struct vnode *vp, acl_type_t type,
 	ap.a_aclp = aclp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_setacl);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1132,7 +1132,7 @@ vop_aclcheck(struct vop_ops *ops, struct vnode *vp, acl_type_t type,
 	ap.a_aclp = aclp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_aclcheck);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1157,7 +1157,7 @@ vop_getextattr(struct vop_ops *ops, struct vnode *vp, int attrnamespace,
 	ap.a_uio = uio;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_getextattr);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1182,7 +1182,7 @@ vop_setextattr(struct vop_ops *ops, struct vnode *vp, int attrnamespace,
 	ap.a_uio = uio;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_setextattr);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1209,7 +1209,7 @@ vop_mountctl(struct vop_ops *ops, struct vnode *vp, int op, struct file *fp,
 	ap.a_buflen = buflen;
 	ap.a_res = res;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_mountctl);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1230,7 +1230,7 @@ vop_markatime(struct vop_ops *ops, struct vnode *vp, struct ucred *cred)
 	ap.a_vp = vp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(vp->v_mount);
+	VFS_MPLOCK(vp->v_mount);
 	DO_OPS(ops, error, &ap, vop_markatime);
 	VFS_MPUNLOCK(vp->v_mount);
 	return(error);
@@ -1261,7 +1261,7 @@ vop_nresolve(struct vop_ops *ops, struct nchandle *nch,
 	ap.a_dvp = dvp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nresolve);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1289,7 +1289,7 @@ vop_nlookupdotdot(struct vop_ops *ops, struct vnode *dvp,
 	ap.a_cred = cred;
 	ap.a_fakename = fakename;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nlookupdotdot);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1323,7 +1323,7 @@ vop_ncreate(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_cred = cred;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_ncreate);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1357,7 +1357,7 @@ vop_nmkdir(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_cred = cred;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nmkdir);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1391,7 +1391,7 @@ vop_nmknod(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_cred = cred;
 	ap.a_vap = vap;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nmknod);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1425,7 +1425,7 @@ vop_nlink(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_vp = vp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nlink);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1462,7 +1462,7 @@ vop_nsymlink(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_vap = vap;
 	ap.a_target = target;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nsymlink);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1494,7 +1494,7 @@ vop_nwhiteout(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_cred = cred;
 	ap.a_flags = flags;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nwhiteout);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1529,7 +1529,7 @@ vop_nremove(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	if ((error = VOP_GETATTR(nch->ncp->nc_vp, &va)) != 0)
 		return (error);
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nremove);
 	/* Only update space counters if this is the last hard link */
 	if ((error == 0) && (va.va_nlink == 1)) {
@@ -1564,7 +1564,7 @@ vop_nrmdir(struct vop_ops *ops, struct nchandle *nch, struct vnode *dvp,
 	ap.a_dvp = dvp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(dvp->v_mount);
+	VFS_MPLOCK(dvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nrmdir);
 	VFS_MPUNLOCK(dvp->v_mount);
 	return(error);
@@ -1602,7 +1602,7 @@ vop_nrename(struct vop_ops *ops,
 	ap.a_tdvp = tdvp;
 	ap.a_cred = cred;
 
-	VFS_MPLOCK1(fdvp->v_mount);
+	VFS_MPLOCK(fdvp->v_mount);
 	DO_OPS(ops, error, &ap, vop_nrename);
 	VFS_MPUNLOCK(fdvp->v_mount);
 	return(error);
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 1e060c537e..c0938bb63f 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -389,7 +389,7 @@ struct mount {
  */
 #define VFS_MPLOCK_DECLARE	int xlock_mpsafe
 
-#define VFS_MPLOCK1(mp)		VFS_MPLOCK_FLAG(mp, MNTK_MPSAFE)
+#define VFS_MPLOCK(mp)		VFS_MPLOCK_FLAG(mp, MNTK_MPSAFE)
 
 #define VFS_MPLOCK_FLAG(mp, flag)					\
 		do {							\