From nobody Wed Feb 22 13:48:49 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 4PMHYs3ThPz3t281; Wed, 22 Feb 2023 13:48:49 +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 4PMHYs2v6Yz3kjx; Wed, 22 Feb 2023 13:48:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677073729; 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=vd6bq8xf2FJMjH7D+DnrIbeNq6XSPRUKmysMpQW9HG4=; b=gsprw5qWDPkI60dJBX9ewdKexlxr+0sNerXXjap061sWH1P5y7bdoEQLHrimTN+w/7Fcog hvtwYq4cYQE5tpJv0oOa0kTtslGqUTB6oNPJYWej2/Sfnaqv6ZhWLQf3ueQHqSr4tK96SG izsmrAfOw/WufBCiImCrJ2O37SQ0xLXF45xREuYTyoJeE8PCG27LMKiBw3HLD625/UH3mp jso51i3TiKOsu4fGA512EwN6wBAzwvgOGD+cXNeb+2Na3U3kvMrnREO/kKMydhi2lMIkRO 7IH/OqTbpn7Spzza3Mo8+/1076+WHGacabj0P31808r3DJfY7XF4GxzLgZ2H0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677073729; 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=vd6bq8xf2FJMjH7D+DnrIbeNq6XSPRUKmysMpQW9HG4=; b=xQc82g3D0At2fIfyT2q37LW34f8dpSl28195l92JmZwX6atYIOaZUfbR7yyJ9/cUmpubKn UxsRJToDylwZKmt52D1aKr8asbyJcdxJ8MOqn8Jwjxr9UHLxIrq4c5Sg/wtXaxf4woA8E3 0lm2Of7Kc1I1duvZiU62D7OFYLk7mfNlX6I+LlGxxeY7PkVL26nEObu+VF5ONQMp2HewVY pLMepJUiTfahXMRMPcLgnbVrb4wfs5l/jSDdvo4GnF8ViKXuXZt+gy/baw8SNAReEE8XFB Qa720aUb/11ZGsYu+fN3GjIZLtHHVB9T8nfSL72eTqw3aWh7EHJZt0AVAJa8VA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677073729; a=rsa-sha256; cv=none; b=JfWHasyUEYTjlpIExr4oz/WrpMXwkjcHH+I+E3POM8DJ2QZKwHTUn0Cka2LSw7t+p2avQF +Wobbm9x8lK5Uii08+VqPvRIDGF1uLjhCV63UdqNOyppJlAGDRt6zWOgShvpcEeqvtH/K/ H5L4MCIRUK22lFpZCI4Uw+CCxvUfECF4teWmYqH2RxSOjYKuSJTNhKcN0pKbe9fPkV8Iji 0yBWZsBTigGeJOuIuXQJZkVej99ZJY+2+fxL9bymp99DQrnhB2INexfSTNoyTx8Pjr42cS U1dGN+2cl1JbN3zQKu/1hcJ5z9NZus/tp2OeaSxWefdxN9FnmLPfpd1N1o300g== 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 4PMHYs1p4hz13FW; Wed, 22 Feb 2023 13:48:49 +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 31MDmn8e056741; Wed, 22 Feb 2023 13:48:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MDmnvG056740; Wed, 22 Feb 2023 13:48:49 GMT (envelope-from git) Date: Wed, 22 Feb 2023 13:48:49 GMT Message-Id: <202302221348.31MDmnvG056740@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: b772fe0d6626 - releng/13.2 - 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: b772fe0d662650d8a517bc07f3c433486c24b347 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=b772fe0d662650d8a517bc07f3c433486c24b347 commit b772fe0d662650d8a517bc07f3c433486c24b347 Author: Allan Jude AuthorDate: 2023-02-18 01:44:34 +0000 Commit: Allan Jude CommitDate: 2023-02-22 13:48:20 +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 Reviewed by: imp (previous version), mm (upstream), freqlabs (upstream) Approved by: re (cperciva) Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38662 (cherry picked from commit 8b04c1cbfc1cb71a1ce53b3a7855f1d45866fcfb) (cherry picked from commit 426ed00525409d084e97dc44397722aff2cc0bb3) --- 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); }