CVS commit: [netbsd-5] src/sys/ufs/ufs

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sun Mar 28 17:31:55 UTC 2010

Modified Files:
        src/sys/ufs/ufs [netbsd-5]: ufs_vnops.c

Log Message:
Pull up following revision(s) (requested by hannken in ticket #1345):
        sys/ufs/ufs/ufs_vnops.c: revision 1.180 via patch
ufs_rmdir(): move fstrans_done() after vput().  No more unlinked and
zero-sized directory inodes in snapshots.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.169.4.1 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.169 src/sys/ufs/ufs/ufs_vnops.c:1.169.4.1
--- src/sys/ufs/ufs/ufs_vnops.c:1.169	Thu Aug 14 16:19:25 2008
+++ src/sys/ufs/ufs/ufs_vnops.c	Sun Mar 28 17:31:55 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_vnops.c,v 1.169 2008/08/14 16:19:25 matt Exp $	*/
+/*	$NetBSD: ufs_vnops.c,v 1.169.4.1 2010/03/28 17:31:55 snj 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.169 2008/08/14 16:19:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.169.4.1 2010/03/28 17:31:55 snj Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -1683,7 +1683,6 @@
 #endif
  out:
 	VN_KNOTE(vp, NOTE_DELETE);
-	fstrans_done(dvp->v_mount);
 	pace = DOINGSOFTDEP(dvp);
 	vput(dvp);
 	vput(vp);
@@ -1694,6 +1693,7 @@
 		 */
 		softdep_pace_dirrem();
 	}
+	fstrans_done(dvp->v_mount);
 	return (error);
 }