Module Name: src
Committed By: martin
Date: Fri Sep 20 09:51:40 UTC 2024
Modified Files:
src/sys/fs/union [netbsd-10]: union_vfsops.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #873):
sys/fs/union/union_vfsops.c: revision 1.87
When mounting a union file system set its lower mount only on success.
To generate a diff of this commit:
cvs rdiff -u -r1.85.2.1 -r1.85.2.2 src/sys/fs/union/union_vfsops.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/fs/union/union_vfsops.c
diff -u src/sys/fs/union/union_vfsops.c:1.85.2.1 src/sys/fs/union/union_vfsops.c:1.85.2.2
--- src/sys/fs/union/union_vfsops.c:1.85.2.1 Mon Feb 6 16:57:24 2023
+++ src/sys/fs/union/union_vfsops.c Fri Sep 20 09:51:40 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.85.2.1 2023/02/06 16:57:24 martin Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.85.2.2 2024/09/20 09:51:40 martin Exp $ */
/*
* Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.85.2.1 2023/02/06 16:57:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.85.2.2 2024/09/20 09:51:40 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -255,15 +255,16 @@ union_mount(struct mount *mp, const char
mp->mnt_data = um;
vfs_getnewfsid(mp);
- error = vfs_set_lowermount(mp, um->um_uppervp->v_mount);
- if (error)
- goto bad;
error = set_statvfs_info(path, UIO_USERSPACE, NULL, UIO_USERSPACE,
mp->mnt_op->vfs_name, mp, l);
if (error)
goto bad;
+ error = vfs_set_lowermount(mp, um->um_uppervp->v_mount);
+ if (error)
+ goto bad;
+
switch (um->um_op) {
case UNMNT_ABOVE:
cp = "<above>:";
