[src/trunk]: src/sys/ufs/ufs Call ufs_extattr_vnode_inactive before UFS_WAPBL...

[manu <manu%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/460291f56b18
branches:  trunk
changeset: 765094:460291f56b18
user:      manu <manu%NetBSD.org@localhost>
date:      Thu May 19 03:25:11 2011 +0000

description:
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

diffstat:

 sys/ufs/ufs/ufs_inode.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 94243a4aeb26 -r 460291f56b18 sys/ufs/ufs/ufs_inode.c
--- a/sys/ufs/ufs/ufs_inode.c   Thu May 19 03:22:27 2011 +0000
+++ b/sys/ufs/ufs/ufs_inode.c   Thu May 19 03:25:11 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_inode.c,v 1.85 2011/05/19 03:11:59 rmind Exp $     */
+/*     $NetBSD: ufs_inode.c,v 1.86 2011/05/19 03:25:11 manu Exp $      */
 
 /*
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.85 2011/05/19 03:11:59 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_inode.c,v 1.86 2011/05/19 03:25:11 manu Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -99,13 +99,13 @@
        if (ip->i_mode == 0)
                goto out;
        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;
                logged = 1;
-#ifdef UFS_EXTATTR
-               ufs_extattr_vnode_inactive(vp, curlwp);
-#endif
                if (ip->i_size != 0) {
                        /*
                         * When journaling, only truncate one indirect block