The branch main has been updated by vangyzen:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84

commit 3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84
Author:     Keith Owens <keith.owe...@dell.com>
AuthorDate: 2021-08-25 01:59:31 +0000
Commit:     Eric van Gyzen <vangy...@freebsd.org>
CommitDate: 2021-08-25 02:00:19 +0000

    ddb: do not assume that ffs is mounted with softdep
    
    Avoid a panic when debugging with "show ffs" in ddb.
    
    Reviewed By:    kib, markj, mckusick
    MFC after:      1 week
    Sponsored by:   Dell EMC Isilon
    Differential Revision: https://reviews.freebsd.org/D31622
---
 sys/ufs/ffs/ffs_softdep.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index e518cc5c5deb..6f1de407135e 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -15009,9 +15009,15 @@ db_print_ffs(struct ufsmount *ump)
 {
        db_printf("mp %p (%s) devvp %p\n", ump->um_mountp,
            ump->um_mountp->mnt_stat.f_mntonname, ump->um_devvp);
-       db_printf("    fs %p su_wl %d su_deps %d su_req %d\n",
-           ump->um_fs, ump->softdep_on_worklist,
-           ump->softdep_deps, ump->softdep_req);
+       db_printf("    fs %p ", ump->um_fs);
+
+       if (ump->um_softdep != NULL) {
+               db_printf("su_wl %d su_deps %d su_req %d\n",
+                   ump->softdep_on_worklist, ump->softdep_deps,
+                   ump->softdep_req);
+       } else {
+               db_printf("su disabled\n");
+       }
 }
 
 static void
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to