Module Name: src
Committed By: dholland
Date: Sun Jul 17 22:00:38 UTC 2011
Modified Files:
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
Fix typo in ufs_rmdir that causes locking botches. This code should be
unreachable because the FS-independent code contains the same test... but
I'm not sure if that applies if nfsd is involved.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/ufs/ufs/ufs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.193 src/sys/ufs/ufs/ufs_vnops.c:1.194
--- src/sys/ufs/ufs/ufs_vnops.c:1.193 Thu Jul 14 16:27:43 2011
+++ src/sys/ufs/ufs/ufs_vnops.c Sun Jul 17 22:00:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vnops.c,v 1.193 2011/07/14 16:27:43 dholland Exp $ */
+/* $NetBSD: ufs_vnops.c,v 1.194 2011/07/17 22:00:38 dholland Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.193 2011/07/14 16:27:43 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.194 2011/07/17 22:00:38 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -1557,9 +1557,9 @@
*/
if (dp == ip || vp->v_mountedhere != NULL) {
if (dp == ip)
- vrele(vp);
+ vrele(dvp);
else
- vput(vp);
+ vput(dvp);
vput(vp);
return (EINVAL);
}
