From nobody Tue Jan 18 23:16:05 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 A8372196EC57; Tue, 18 Jan 2022 23:16:09 +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 4Jdl542sJBz3kWb; Tue, 18 Jan 2022 23:16:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642547769; 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=Mturg5pNCTB2cmOk1kyJQwuWxvZHW4bBFjMKaZOl3zE=; b=UQoHyIp9URzlzn9OU92UOkatNycxs0HlhgaJejXlIBHEo59riLuEzxraBB6zKLE8RmkVjI t5QQktdhpcLm/BInZ8H9wyh6UaZ1SAkmby5V+VzGLqiUE5ATa5lw2nxFCpcZr1MajJrliZ K9Xldpt4HuWxxY6W2394Au2Mj/55lG0EoylDqGvFEvh0/wb+qdp8Ecin7M7xbcPd9lXGBq kLI8IsRySo2DmcvoDbGhiafEouxlv5S9UDuskdhsskiriB43W8DI5wr+F3eRdUGO6mO6lB 0OSKFoXF6TEs1oy1XMhKvhKwF4OH5rpTPOPXLWQr9QO6pdBlbOrpnWoh4D2s/w== 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 291E62388; Tue, 18 Jan 2022 23:16:06 +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 20ING52s095949; Tue, 18 Jan 2022 23:16:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20ING5nU095948; Tue, 18 Jan 2022 23:16:05 GMT (envelope-from git) Date: Tue, 18 Jan 2022 23:16:05 GMT Message-Id: <202201182316.20ING5nU095948@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: d78723738bbc - stable/13 - When doing a read-only mount of a UFS filesystem using gjournal(8), suppress error message about a missing gjournal provider. 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: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d78723738bbc73bf0bf01ba8ff06113590935248 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642547769; 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=Mturg5pNCTB2cmOk1kyJQwuWxvZHW4bBFjMKaZOl3zE=; b=cm9uwpaCDXHfSqBFEo5D5rtWT4VhvDnj376/U3NrTAL4RTKoFNPZ5dOv+CkFjGj/sCBeoW /3eT+9unRkyzAQZdNaTE07DSRffCXhFRSugA3MnSDyKg0T2dPqe+fl8bJOcG+02yFvOdkt DlXWoAPTumrhol6DBWJImEtv+9KF6dLWOsga6WN+Nclt/1mbZoKPxmhS5l9T+alTeoOg+B jXmZCrVgyrxYHJAz5VuwV9bXzWRaa0zbylTcnRtMFeEPZkV9VwAnuKatM0w9qtpj9VruHf Xp0DXm3nJ/F/Psz18ayp7druPZj3Vmdn1Vtj16n8UAHQB9XoumH1ffc4+kfjqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642547769; a=rsa-sha256; cv=none; b=YUi+UkQhsWrH4JE5Ott9fGMY8BgQ/0UbxZvp2ZX+DOrvpJkZWnwE/m+qdkVPvy1VW2a9Ti EFxgrLdbSQ1Op0LNbnbDEGN5v95D06o8wM73k5F4ODe/jtmtKZI2Aftwk9gmp4j9PAc2jR Ojza8KPsIHLwodeAE5G8X3gHIxy54uMECEMjTkpga+RaygxjRIBbK5ApHEFpQ8Dg4LawU9 w372OWR17FwP8TdG3o6VB0xi7Myd8ZFIlXCi2XG7IFhL5q223GzDO8+i8UeCcbb1W6MecO cJgHh00KuOfnl/yyKWOpmczmjlWYyxzUg45BXDE2ngIDdUGu6ZKiQDD2a1MGIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=d78723738bbc73bf0bf01ba8ff06113590935248 commit d78723738bbc73bf0bf01ba8ff06113590935248 Author: Kirk McKusick AuthorDate: 2022-01-02 22:04:06 +0000 Commit: Kirk McKusick CommitDate: 2022-01-18 23:13:42 +0000 When doing a read-only mount of a UFS filesystem using gjournal(8), suppress error message about a missing gjournal provider. Submitted by: Andreas Longwitz Sponsored by: Netflix (cherry picked from commit 1fbcaa13b033230c52487a270803bd0f7723e107) --- sys/ufs/ffs/ffs_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 507f0b148fc5..90cf92305022 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1043,9 +1043,10 @@ ffs_mountfs(odevvp, mp, td) mp->mnt_flag |= MNT_GJOURNAL; MNT_IUNLOCK(mp); } else { - printf("WARNING: %s: GJOURNAL flag on fs " - "but no gjournal provider below\n", - mp->mnt_stat.f_mntonname); + if ((mp->mnt_flag & MNT_RDONLY) == 0) + printf("WARNING: %s: GJOURNAL flag on fs " + "but no gjournal provider below\n", + mp->mnt_stat.f_mntonname); free(mp->mnt_gjprovider, M_UFSMNT); mp->mnt_gjprovider = NULL; }