Module Name: src
Committed By: riz
Date: Sat Jul 16 00:19:13 UTC 2011
Modified Files:
src/sys/ufs/ufs [netbsd-5]: ufs_inode.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1642):
sys/ufs/ufs/ufs_inode.c: revision 1.86
Call ufs_extattr_vnode_inactive before UFS_WAPBL_BEGIN, as the latter will
leave the vnode locked, and ufs_extattr_vnode_inactive does lock/unlock
To generate a diff of this commit:
cvs rdiff -u -r1.76.4.4 -r1.76.4.5 src/sys/ufs/ufs/ufs_inode.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_inode.c
diff -u src/sys/ufs/ufs/ufs_inode.c:1.76.4.4 src/sys/ufs/ufs/ufs_inode.c:1.76.4.5
--- src/sys/ufs/ufs/ufs_inode.c:1.76.4.4 Tue Sep 7 19:33:35 2010
+++ src/sys/ufs/ufs/ufs_inode.c Sat Jul 16 00:19:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_inode.c,v 1.76.4.4 2010/09/07 19:33:35 bouyer Exp $ */
+/* $NetBSD: ufs_inode.c,v 1.76.4.5 2011/07/16 00:19:13 riz Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.76.4.4 2010/09/07 19:33:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.76.4.5 2011/07/16 00:19:13 riz Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -102,6 +102,9 @@
softdep_releasefile(ip);
if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
+#ifdef UFS_EXTATTR
+ ufs_extattr_vnode_inactive(vp, curlwp);
+#endif
error = UFS_WAPBL_BEGIN(vp->v_mount);
if (error)
goto out;
@@ -109,9 +112,6 @@
#ifdef QUOTA
(void)chkiq(ip, -1, NOCRED, 0);
#endif
-#ifdef UFS_EXTATTR
- ufs_extattr_vnode_inactive(vp, curlwp);
-#endif
if (ip->i_size != 0) {
/*
* When journaling, only truncate one indirect block
