From owner-dev-commits-src-all@freebsd.org Wed Aug 25 02:02:16 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5509266C1E9; Wed, 25 Aug 2021 02:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GvTkc1yvqz4TVh; Wed, 25 Aug 2021 02:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C3781402D; Wed, 25 Aug 2021 02:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17P22GAG039641; Wed, 25 Aug 2021 02:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17P22G7w039640; Wed, 25 Aug 2021 02:02:16 GMT (envelope-from git) Date: Wed, 25 Aug 2021 02:02:16 GMT Message-Id: <202108250202.17P22G7w039640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: 3b29c8b4bdb0 - main - ddb: do not assume that ffs is mounted with softdep MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Aug 2021 02:02:16 -0000 The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84 commit 3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84 Author: Keith Owens AuthorDate: 2021-08-25 01:59:31 +0000 Commit: Eric van Gyzen 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