From nobody Thu Mar 03 14:20:42 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 13D3519E5ED7; Thu, 3 Mar 2022 14:20:44 +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 4K8Y6z08Jkz3Lbk; Thu, 3 Mar 2022 14:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z6pB8ttRKLY36e/vaGfzXEWFZyEcsH3YNWUedQuDl7Q=; b=XTb8m/GXzqHEdeichkikgQm12i8eFfRH9pJGYSlP2JrZV72Q4mm0J6nOlyYbikjUfOZ/Ww 65G7YTm9mclzKzkp+9BkX3Q3OsTSdbCIyuzb39BjBz5y5I9T3J3J/+CfrJyMk+9ZKMLaBP rxUl2yK3WnJbWnPTtZN5Efi4ZDRBE9/jTbOeuthkYv/c6RWOLZOxkzttmXiNb3f/Z9icRC xncTBc+GJm3e76dXa9lBbj876AQhJ6dYbiWmyWkhvWeEdAFo6EBFouU7mSjWRN9/80bJAR X8lh4iAFVRBaIEVbKxPkNjJpukyYv26JsP3lCu0WCvXj6Hi8YmcfYpiLxD6Ctg== 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 9C062191EA; Thu, 3 Mar 2022 14:20:42 +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 223EKggx090726; Thu, 3 Mar 2022 14:20:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223EKgEF090725; Thu, 3 Mar 2022 14:20:42 GMT (envelope-from git) Date: Thu, 3 Mar 2022 14:20:42 GMT Message-Id: <202203031420.223EKgEF090725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 487cee4ddc7d - stable/13 - ddb: do not assume that ffs is mounted with softdep List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 487cee4ddc7dd51cc8a3963ca08259fbe3dc686d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z6pB8ttRKLY36e/vaGfzXEWFZyEcsH3YNWUedQuDl7Q=; b=kVAlpqMuIlYQcvo3DSPwpJX3yp3/YlikOgtGW/jZh4R/RuZxiDrtAq4smDLvOLZVNeztMs APqaCElZovbWhcZp96QkX6UJt9+6XnE0miATb1v27breBcr5JDPfd51LtkwzA+zkxO5nS+ bFjz+Jym6a1ewOJBk03g1TMBBqObn+tC36U0+pQSwmZEaF3EOA6kx7CSaartcp8owoeUAc o4jc9Ii7uKN8O94B0piMOA626y/zEpUdzfQzLk8v89wf9xmpW4MecSM0BMNnRsp0zBy+ED 6qCwOEcf8MN/pGY6Ka4BB2i6KghLrREn+EP1/3Z/p7r2vqFbxC6nXZ2DouesGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646317243; a=rsa-sha256; cv=none; b=d60JQm4VoNVWtb760tTd7zj1o7n3d7af6iWK4vtSjJvVJcAmHlUHyXB092YsGkCTK46g3X 7MC+1iFhyO9A7VnBWT0NhDMWMPvk+oXg6vPWXmdE5QBrv8qkjI872LCqj0VDogrG74hAeS qZCVomjLcVMYTPE9iT0W0r9TS8s7CRSYYU3co9AZOUOMLoqafzLykWTvmNK6oXrN+pYPmb ic2q5KJHoAYi9CnMTD4HbDjMk/ef5/bciWziUCwActmOjRrxY8gEmImw0sqKntnrKF7cEa bmvKqg06yNfGyt+XAJXwykk7Tna/5oSMQSEwqdQ9XQA60nZgGvZo4iMSnO2A2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=487cee4ddc7dd51cc8a3963ca08259fbe3dc686d commit 487cee4ddc7dd51cc8a3963ca08259fbe3dc686d Author: Keith Owens AuthorDate: 2021-08-25 01:59:31 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-03 14:20:07 +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 (cherry picked from commit 3b29c8b4bdb0e396d7bb5d0760f11d7fa4208c84) --- 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 37709b605fbd..d8b143d9d816 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -15006,9 +15006,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