Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/sys/fs/udf Pull up following revision(s) (requested by ha...



details:   https://anonhg.NetBSD.org/src/rev/e78cbaf73a86
branches:  netbsd-8
changeset: 850776:e78cbaf73a86
user:      snj <snj%NetBSD.org@localhost>
date:      Sat Jul 01 08:53:06 2017 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #75):
        sys/fs/udf/udf_vfsops.c: revision 1.76
No need to call vflush from failing udf_mount().  If the system nodes
really have to disappear we should change vrele() to vrecycle() here.

diffstat:

 sys/fs/udf/udf_vfsops.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (48 lines):

diff -r 98f8b8e897f0 -r e78cbaf73a86 sys/fs/udf/udf_vfsops.c
--- a/sys/fs/udf/udf_vfsops.c   Sat Jul 01 08:51:04 2017 +0000
+++ b/sys/fs/udf/udf_vfsops.c   Sat Jul 01 08:53:06 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vfsops.c,v 1.75 2017/04/01 19:35:56 riastradh Exp $ */
+/* $NetBSD: udf_vfsops.c,v 1.75.6.1 2017/07/01 08:53:06 snj Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vfsops.c,v 1.75 2017/04/01 19:35:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vfsops.c,v 1.75.6.1 2017/07/01 08:53:06 snj Exp $");
 #endif /* not lint */
 
 
@@ -277,7 +277,6 @@
 udf_release_system_nodes(struct mount *mp)
 {
        struct udf_mount *ump = VFSTOUDF(mp);
-       int error;
 
        /* if we haven't even got an ump, dont bother */
        if (!ump)
@@ -294,10 +293,6 @@
                vrele(ump->metadatamirror_node->vnode);
        if (ump->metadatabitmap_node)
                vrele(ump->metadatabitmap_node->vnode);
-
-       /* This flush should NOT write anything nor allow any node to remain */
-       if ((error = vflush(ump->vfs_mountp, NULLVP, 0)) != 0)
-               panic("Failure to flush UDF system vnodes\n");
 }
 
 
@@ -520,6 +515,10 @@
        /* NOTE release system nodes should NOT write anything */
        udf_release_system_nodes(mp);
 
+       /* This flush should NOT write anything nor allow any node to remain */
+       if ((error = vflush(ump->vfs_mountp, NULLVP, 0)) != 0)
+               panic("Failure to flush UDF system vnodes\n");
+
        /* finalise disc strategy */
        udf_discstrat_finish(ump);
 



Home | Main Index | Thread Index | Old Index