D51211.1791065748.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D51211.1791065748.diff
View Options

	diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c
	--- a/sys/fs/nfsserver/nfs_nfsdport.c
	+++ b/sys/fs/nfsserver/nfs_nfsdport.c
	@@ -1698,10 +1698,26 @@
	" dsdvp=%p\n", dsdvp[0]);
	}
	out:
	- if (!error) {
	+ mp = NULL;
	+ if (error == 0) {
	+ error = VOP_GETWRITEMOUNT(tondp->ni_dvp, &mp);
	+ if (error == 0) {
	+ if (mp == NULL) {
	+ error = ENOENT;
	+ } else {
	+ error = lockmgr(&mp->mnt_renamelock,
	+ LK_EXCLUSIVE \| LK_NOWAIT, NULL);
	+ if (error != 0)
	+ error = ERELOOKUP;
	+ }
	+ }
	+ }
	+ if (error == 0) {
	error = VOP_RENAME(fromndp->ni_dvp, fromndp->ni_vp,
	&fromndp->ni_cnd, tondp->ni_dvp, tondp->ni_vp,
	&tondp->ni_cnd);
	+ lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0);
	+ vfs_rel(mp);
	} else {
	if (tdvp == tvp)
	vrele(tdvp);
	@@ -1711,8 +1727,13 @@
	vput(tvp);
	vrele(fromndp->ni_dvp);
	vrele(fvp);
	- if (error == EJUSTRETURN)
	+ if (error == EJUSTRETURN) {
	error = 0;
	+ } else if (error == ERELOOKUP && mp != NULL) {
	+ lockmgr(&mp->mnt_renamelock, LK_EXCLUSIVE, 0);
	+ lockmgr(&mp->mnt_renamelock, LK_RELEASE, 0);
	+ vfs_rel(mp);
	+ }
	}

	/*