Module Name: src
Committed By: riastradh
Date: Wed Oct 26 23:39:11 UTC 2022
Modified Files:
src/sys/dev: firmload.c
src/sys/kern: vfs_mount.c
src/sys/rump/librump/rumpvfs: rump_vfs.c
src/sys/sys: filedesc.h
Log Message:
sys/filedesc.h: New home for extern cwdi0.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/firmload.c
cvs rdiff -u -r1.97 -r1.98 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.93 -r1.94 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.69 -r1.70 src/sys/sys/filedesc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/firmload.c
diff -u src/sys/dev/firmload.c:1.23 src/sys/dev/firmload.c:1.24
--- src/sys/dev/firmload.c:1.23 Tue Jun 29 22:40:53 2021
+++ src/sys/dev/firmload.c Wed Oct 26 23:39:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: firmload.c,v 1.23 2021/06/29 22:40:53 dholland Exp $ */
+/* $NetBSD: firmload.c,v 1.24 2022/10/26 23:39:10 riastradh Exp $ */
/*-
* Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.23 2021/06/29 22:40:53 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firmload.c,v 1.24 2022/10/26 23:39:10 riastradh Exp $");
/*
* The firmload API provides an interface for device drivers to access
@@ -209,7 +209,6 @@ firmware_open(const char *drvname, const
firmware_handle_t fh;
struct vnode *vp;
int error;
- extern struct cwdinfo cwdi0;
if (drvname == NULL || imgname == NULL)
return (EINVAL);
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.97 src/sys/kern/vfs_mount.c:1.98
--- src/sys/kern/vfs_mount.c:1.97 Tue Sep 13 09:35:31 2022
+++ src/sys/kern/vfs_mount.c Wed Oct 26 23:39:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.97 2022/09/13 09:35:31 riastradh Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.98 2022/10/26 23:39:10 riastradh Exp $ */
/*-
* Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.97 2022/09/13 09:35:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.98 2022/10/26 23:39:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1273,7 +1273,6 @@ done:
if (error == 0) {
mount_iterator_t *iter;
struct mount *mp;
- extern struct cwdinfo cwdi0;
mountlist_iterator_init(&iter);
mp = mountlist_iterator_next(iter);
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.93 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.94
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.93 Sat Apr 25 15:42:15 2020
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Wed Oct 26 23:39:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.93 2020/04/25 15:42:15 bouyer Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.94 2022/10/26 23:39:10 riastradh Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.93 2020/04/25 15:42:15 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.94 2022/10/26 23:39:10 riastradh Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -57,7 +57,6 @@ __KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v
#include <rump/rump.h>
#include <rump/rumpuser.h>
-extern struct cwdinfo cwdi0;
const char *rootfstype = ROOT_FSTYPE_ANY;
static void
Index: src/sys/sys/filedesc.h
diff -u src/sys/sys/filedesc.h:1.69 src/sys/sys/filedesc.h:1.70
--- src/sys/sys/filedesc.h:1.69 Tue Jun 29 22:40:53 2021
+++ src/sys/sys/filedesc.h Wed Oct 26 23:39:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: filedesc.h,v 1.69 2021/06/29 22:40:53 dholland Exp $ */
+/* $NetBSD: filedesc.h,v 1.70 2022/10/26 23:39:10 riastradh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -187,6 +187,8 @@ struct fileops;
struct socket;
struct proc;
+extern struct cwdinfo cwdi0;
+
/*
* Kernel global variables and routines.
*/
