From nobody Tue Feb 21 22:47:30 2023 X-Original-To: dev-commits-src-branches@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 4PLvYv19Mpz3tZpX; Tue, 21 Feb 2023 22:47:31 +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 4PLvYv0d29z4Psr; Tue, 21 Feb 2023 22:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677019651; 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=LdGrZcuPgvLOwY+jgfwdsPIybvu8ciCIgAAUd0ICg6s=; b=vnMGtoaBWqYSJxOJlMSw5aLs+vyY7tunn6iusWAPcJLnmexP757lJvxvmAY5QPkfuXUEgp BZOcxC2/Lh8NiOuCCRP0/8UfYa1iRSeNS6/g530361rHIGNWMU7PqoWPH6D7PKn0b/h5z9 tsUGbFs6UzmQScQInJNeqg8CYkPnXHdxQGqNmAy1n+QKV9lFLErCAiuuzI7Q7A9bvUoo4L /8OKIdVnyYJIj7onuYcEiFKX1eGh669wS5wJnX8og2Dc8LE1XlwGWsdK3THRZf5+FsQMFE J3YgP+lpotIhA6muOE3vxJ5UC/zH8Y728wG2oJWTpOFJyPPJmYSchj71UOkuhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677019651; 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=LdGrZcuPgvLOwY+jgfwdsPIybvu8ciCIgAAUd0ICg6s=; b=OGRWF/twbmaB16SLLCZL7pVWN9CzzKZnw11dR8ERMxujlm+6TGzpqqSMfYxrom5pMAUyoK wsAiYOQsQaoxp5qm48p6pq+t3GMvb6fMBuB06L2A1t9wxFwUrNaNsZR4P86DlPDjReiE9d lWwDtUsbquqi7n77rpk8MYMI5JSxAsGZfdrp7MoXAzEzw2dtJgvfBeYIEXR3og4O0Xzp2z AJQPOOHwtDw1xqfkGii/6JfemuuLbZE8ZBN0tvIjTMC2uajDCydH2+5FHcg4+ckTPz466o es3PfRgEJBaoAvSxRXtBpjY6eW9HAiZL25G01vU6NoXZpjXZ3KVgC5RdDfFZdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677019651; a=rsa-sha256; cv=none; b=igfg6/H4wk+chI9z3/a/baF86U7N4RgwDmhwQPqIqLN58nlARrpvSnH42NBpK2CBhf86u7 OvszB3yGHB15uelqa1vI+ZSTCUtZKDXeh9/RvGMP0/3s2ZNl139bE+SvaG5nB4AG6GgT1o sde13XNrc3Vk8IpsUk60mOso3h4REwnNTIKF41pQ8C8pDAqyWFjdLKoyD6wMyeRF2tsHyE pCIFGlSOVCAg6vdnd49Saih1aCezVnwWGhBqydaUCtX9bwtZLLYx+8VVe/Q1nN1r4C28DF GP/Emc7Hv7pPHshII657/5GiL4SzBLlrecEH+prIXw/qGqXHLZibr3zYxa77yg== 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 4PLvYt6p8gzcwh; Tue, 21 Feb 2023 22:47:30 +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 31LMlUqA068018; Tue, 21 Feb 2023 22:47:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31LMlUPJ068017; Tue, 21 Feb 2023 22:47:30 GMT (envelope-from git) Date: Tue, 21 Feb 2023 22:47:30 GMT Message-Id: <202302212247.31LMlUPJ068017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Allan Jude Subject: git: 426ed0052540 - stable/13 - Fix per-jail zfs.mount_snapshot setting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 426ed00525409d084e97dc44397722aff2cc0bb3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=426ed00525409d084e97dc44397722aff2cc0bb3 commit 426ed00525409d084e97dc44397722aff2cc0bb3 Author: Allan Jude AuthorDate: 2023-02-18 01:44:34 +0000 Commit: Allan Jude CommitDate: 2023-02-21 22:47:21 +0000 Fix per-jail zfs.mount_snapshot setting When jail.conf set the nopersist flag during startup, it was incorrectly destroying the per-jail ZFS settings. PR: 260160 Reported by: imp (previous version), mm (upstream), freqlabs (upstream) MFC after: immediately Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38662 (cherry picked from commit 8b04c1cbfc1cb71a1ce53b3a7855f1d45866fcfb) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c index 85449ebb9d97..6ffd36885655 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c @@ -2525,7 +2525,9 @@ zfs_jailparam_set(void *obj, void *data) mount_snapshot = -1; else jsys = JAIL_SYS_NEW; - if (jsys == JAIL_SYS_NEW) { + switch (jsys) { + case JAIL_SYS_NEW: + { /* "zfs=new" or "zfs.*": the prison gets its own ZFS info. */ struct zfs_jailparam *zjp; @@ -2543,12 +2545,22 @@ zfs_jailparam_set(void *obj, void *data) if (mount_snapshot != -1) zjp->mount_snapshot = mount_snapshot; mtx_unlock(&pr->pr_mtx); - } else { + break; + } + case JAIL_SYS_INHERIT: /* "zfs=inherit": inherit the parent's ZFS info. */ mtx_lock(&pr->pr_mtx); osd_jail_del(pr, zfs_jailparam_slot); mtx_unlock(&pr->pr_mtx); + break; + case -1: + /* + * If the setting being changed is not ZFS related + * then do nothing. + */ + break; } + return (0); }