Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Set "mnt_lower" before the first file system operation o...
details: https://anonhg.NetBSD.org/src/rev/4b9b8cff1f0b
branches: trunk
changeset: 839452:4b9b8cff1f0b
user: hannken <hannken%NetBSD.org@localhost>
date: Wed Feb 20 10:05:59 2019 +0000
description:
Set "mnt_lower" before the first file system operation on the new file system.
diffstat:
sys/fs/union/union_vfsops.c | 7 +++----
sys/miscfs/nullfs/null_vfsops.c | 6 +++---
sys/miscfs/overlay/overlay_vfsops.c | 6 +++---
sys/miscfs/umapfs/umap_vfsops.c | 7 ++++---
4 files changed, 13 insertions(+), 13 deletions(-)
diffs (137 lines):
diff -r e0b8e3c0ba46 -r 4b9b8cff1f0b sys/fs/union/union_vfsops.c
--- a/sys/fs/union/union_vfsops.c Wed Feb 20 10:05:20 2019 +0000
+++ b/sys/fs/union/union_vfsops.c Wed Feb 20 10:05:59 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: union_vfsops.c,v 1.78 2017/04/01 19:35:56 riastradh Exp $ */
+/* $NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken 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.78 2017/04/01 19:35:56 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,14 +246,13 @@
mp->mnt_data = um;
vfs_getnewfsid(mp);
+ mp->mnt_lower = um->um_uppervp->v_mount;
error = set_statvfs_info( path, UIO_USERSPACE, NULL, UIO_USERSPACE,
mp->mnt_op->vfs_name, mp, l);
if (error)
goto bad;
- mp->mnt_lower = um->um_uppervp->v_mount;
-
switch (um->um_op) {
case UNMNT_ABOVE:
cp = "<above>:";
diff -r e0b8e3c0ba46 -r 4b9b8cff1f0b sys/miscfs/nullfs/null_vfsops.c
--- a/sys/miscfs/nullfs/null_vfsops.c Wed Feb 20 10:05:20 2019 +0000
+++ b/sys/miscfs/nullfs/null_vfsops.c Wed Feb 20 10:05:59 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: null_vfsops.c,v 1.94 2017/04/11 07:51:37 hannken Exp $ */
+/* $NetBSD: null_vfsops.c,v 1.95 2019/02/20 10:06:00 hannken Exp $ */
/*
* Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.94 2017/04/11 07:51:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.95 2019/02/20 10:06:00 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,6 +146,7 @@
* that the node create call will work.
*/
vfs_getnewfsid(mp);
+ mp->mnt_lower = lowerrootvp->v_mount;
nmp->nullm_size = sizeof(struct null_node);
nmp->nullm_tag = VT_NULL;
@@ -175,7 +176,6 @@
if (error)
return error;
- mp->mnt_lower = lowerrootvp->v_mount;
if (mp->mnt_lower->mnt_flag & MNT_LOCAL)
mp->mnt_flag |= MNT_LOCAL;
return 0;
diff -r e0b8e3c0ba46 -r 4b9b8cff1f0b sys/miscfs/overlay/overlay_vfsops.c
--- a/sys/miscfs/overlay/overlay_vfsops.c Wed Feb 20 10:05:20 2019 +0000
+++ b/sys/miscfs/overlay/overlay_vfsops.c Wed Feb 20 10:05:59 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: overlay_vfsops.c,v 1.67 2017/04/11 07:51:37 hannken Exp $ */
+/* $NetBSD: overlay_vfsops.c,v 1.68 2019/02/20 10:06:00 hannken Exp $ */
/*
* Copyright (c) 1999, 2000 National Aeronautics & Space Administration
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.67 2017/04/11 07:51:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: overlay_vfsops.c,v 1.68 2019/02/20 10:06:00 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,6 +155,7 @@
* that the node create call will work.
*/
vfs_getnewfsid(mp);
+ mp->mnt_lower = lowerrootvp->v_mount;
nmp->ovm_size = sizeof (struct overlay_node);
nmp->ovm_tag = VT_OVERLAY;
@@ -189,7 +190,6 @@
if (error)
return error;
- mp->mnt_lower = lowerrootvp->v_mount;
if (mp->mnt_lower->mnt_flag & MNT_LOCAL)
mp->mnt_flag |= MNT_LOCAL;
#ifdef OVERLAYFS_DIAGNOSTIC
diff -r e0b8e3c0ba46 -r 4b9b8cff1f0b sys/miscfs/umapfs/umap_vfsops.c
--- a/sys/miscfs/umapfs/umap_vfsops.c Wed Feb 20 10:05:20 2019 +0000
+++ b/sys/miscfs/umapfs/umap_vfsops.c Wed Feb 20 10:05:59 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: umap_vfsops.c,v 1.99 2017/04/11 07:51:37 hannken Exp $ */
+/* $NetBSD: umap_vfsops.c,v 1.100 2019/02/20 10:06:00 hannken Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.99 2017/04/11 07:51:37 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umap_vfsops.c,v 1.100 2019/02/20 10:06:00 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,6 +191,8 @@
* that the node create call will work.
*/
vfs_getnewfsid(mp);
+ mp->mnt_lower = lowerrootvp->v_mount;
+
amp->umapm_size = sizeof(struct umap_node);
amp->umapm_tag = VT_UMAP;
amp->umapm_bypass = umap_bypass;
@@ -224,7 +226,6 @@
if (error)
return error;
- mp->mnt_lower = lowerrootvp->v_mount;
if (mp->mnt_lower->mnt_flag & MNT_LOCAL)
mp->mnt_flag |= MNT_LOCAL;
#ifdef UMAPFS_DIAGNOSTIC
Home |
Main Index |
Thread Index |
Old Index