[src/netbsd-6]: src/sys/ufs/ffs Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/e4e808a13e88
branches:  netbsd-6
changeset: 774601:e4e808a13e88
user:      riz <riz%NetBSD.org@localhost>
date:      Thu Sep 13 22:27:43 2012 +0000

description:
Pull up following revision(s) (requested by manu in ticket #553):
        sys/ufs/ffs/ffs_vfsops.c: revision 1.278
Stop extended attributes at the appropriate place so that unmount
does not fail with EBUSY on filesystem with extended attributes ensabled.

diffstat:

 sys/ufs/ffs/ffs_vfsops.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r 67d196ab6a23 -r e4e808a13e88 sys/ufs/ffs/ffs_vfsops.c
--- a/sys/ufs/ffs/ffs_vfsops.c  Thu Sep 13 22:24:27 2012 +0000
+++ b/sys/ufs/ffs/ffs_vfsops.c  Thu Sep 13 22:27:43 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vfsops.c,v 1.275.2.1 2012/05/07 03:01:12 riz Exp $ */
+/*     $NetBSD: ffs_vfsops.c,v 1.275.2.2 2012/09/13 22:27:43 riz Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.275.2.1 2012/05/07 03:01:12 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.275.2.2 2012/09/13 22:27:43 riz Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -1464,12 +1464,6 @@
                return error;
        }
 #endif /* WAPBL */
-#ifdef UFS_EXTATTR
-       if (ump->um_fstype == UFS1) {
-               ufs_extattr_stop(mp, l);
-               ufs_extattr_uepm_destroy(&ump->um_extattr);
-       }
-#endif /* UFS_EXTATTR */
 
        if (ump->um_devvp->v_type != VBAD)
                ump->um_devvp->v_specmountpoint = NULL;
@@ -1517,6 +1511,14 @@
        if ((error = quota2_umount(mp, flags)) != 0)
                return (error);
 #endif
+#ifdef UFS_EXTATTR
+       if (ump->um_fstype == UFS1) {
+               if (ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_STARTED)
+                       ufs_extattr_stop(mp, l);
+               if (ump->um_extattr.uepm_flags & UFS_EXTATTR_UEPM_INITIALIZED)
+                       ufs_extattr_uepm_destroy(&ump->um_extattr);
+       }
+#endif
        if ((error = vflush(mp, 0, SKIPSYSTEM | flags)) != 0)
                return (error);
        ffs_snapshot_unmount(mp);