Module Name: src
Committed By: martin
Date: Sat Jun 3 14:47:52 UTC 2023
Modified Files:
src/sys/ddb [netbsd-10]: db_command.c
Log Message:
Pull up following revision(s) (requested by uwe in ticket #188):
sys/ddb/db_command.c: revision 1.182
ddb: PR kern/57435 - fix duplicate "show mount"
Bolivar cannot carry double. One of these commands should have been
"show mounts", cf. page/pages and a few others. While here fix the
function name to be db_show_all_mounts to conform to the pattern.
To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.181.4.1 src/sys/ddb/db_command.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/ddb/db_command.c
diff -u src/sys/ddb/db_command.c:1.181 src/sys/ddb/db_command.c:1.181.4.1
--- src/sys/ddb/db_command.c:1.181 Thu Apr 28 07:08:38 2022
+++ src/sys/ddb/db_command.c Sat Jun 3 14:47:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_command.c,v 1.181 2022/04/28 07:08:38 msaitoh Exp $ */
+/* $NetBSD: db_command.c,v 1.181.4.1 2023/06/03 14:47:52 martin Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2009, 2019
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.181 2022/04/28 07:08:38 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_command.c,v 1.181.4.1 2023/06/03 14:47:52 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -203,7 +203,7 @@ static void db_show_all_locks(db_expr_t,
static void db_show_lockstats(db_expr_t, bool, db_expr_t, const char *);
static void db_show_all_freelists(db_expr_t, bool, db_expr_t, const char *);
static void db_mount_print_cmd(db_expr_t, bool, db_expr_t, const char *);
-static void db_show_all_mount(db_expr_t, bool, db_expr_t, const char *);
+static void db_show_all_mounts(db_expr_t, bool, db_expr_t, const char *);
static void db_mbuf_print_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_kqueue_print_cmd(db_expr_t, bool, db_expr_t, const char *);
static void db_map_print_cmd(db_expr_t, bool, db_expr_t, const char *);
@@ -279,10 +279,10 @@ static const struct db_command db_show_c
"-c prints all mbuf chains") },
{ DDB_ADD_CMD("module", db_show_module_cmd, 0,
"Print kernel modules", NULL, NULL) },
- { DDB_ADD_CMD("mount", db_show_all_mount, 0,
- "Print all mount structures.", "[/f]", NULL) },
{ DDB_ADD_CMD("mount", db_mount_print_cmd, 0,
"Print the mount structure at address.", "[/f] address",NULL) },
+ { DDB_ADD_CMD("mounts", db_show_all_mounts, 0,
+ "Print all mount structures.", "[/f]", NULL) },
#ifdef MQUEUE
{ DDB_ADD_CMD("mqueue", db_show_mqueue_cmd, 0,
"Print the message queues", NULL, NULL) },
@@ -1244,7 +1244,7 @@ db_mount_print_cmd(db_expr_t addr, bool
}
static void
-db_show_all_mount(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
+db_show_all_mounts(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
#ifdef _KERNEL /* XXX CRASH(8) */
bool full = false;
