From nobody Wed Apr 06 03:41:11 2022 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 69D9D1A8FB3A; Wed, 6 Apr 2022 03:41:12 +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 4KY9KN0d0Yz4qkh; Wed, 6 Apr 2022 03:41:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216472; 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=ea0OizoOmY5kA5F/OJRNQiBSgUyfLZUGCaSWoCxLsTE=; b=EiOvfLnlh+66AsGpYoPPkE5KnMjunWfWHCbgj/O3U0gbw+qRgWMYFGZ12tyv+0WfCUV4su eUr4LYBfkfey/VCorTEB3+ownOijNkdP+zVpVS4HRmzv6XE10LhL5YZBbZSdyPMp7PWTPF j//jxPOANeoWM3qjMWo8dM/0gTgi/JuGg1TUVDpVLx6I+Zv+CC9cmY8uK+WGoZmQ76KQ6i 16rG9v8UnslKCWozY8iwkrWwdIMJqLN70nOcncdiFaeJTcHA/UWO4sy7t3Dk1svsVazMgI xAHekzhM/geHCTQmeU30F7n3psupIq5f7dGYEhT7Ncwhk9MsSw2xMjQWm1yv2g== 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 D53BF1366C; Wed, 6 Apr 2022 03:41:11 +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 2363fBcZ088580; Wed, 6 Apr 2022 03:41:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2363fBl2088579; Wed, 6 Apr 2022 03:41:11 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:41:11 GMT Message-Id: <202204060341.2363fBl2088579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 6bbc09343aba - stable/12 - libbe: pull props for the correct dataset in be_mounted_at() 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 6bbc09343aba7118b033da5980472483622aa572 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216472; 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=ea0OizoOmY5kA5F/OJRNQiBSgUyfLZUGCaSWoCxLsTE=; b=dfACMkEaA9b5SUvLg5vUcB3dq4PT2CmVmKD0THufFixPSmGNllNPD98ip1pHKugKGDjYMj cGpoq1HYUgIZeMfdLIljF7tOXXmDyWK2IO32E3EHPLquiUFfek3pg+RHs8StuNYNnDXvou kRIUO1+22IE6pcAYgSt8v2EMv/fj9IM/oJW7ay8xaaEp0EcQWHE1DfcgzHL4WpfXvcrv+K Mvn1b2WCyFkwuHU4tDidZSi9vrYWHXAR+1PAnJvK4VlxkW5f6Gu/7fxkycJC7PKvpIRgjI jDxe2xZ3l2nEeeifAsf1imRpAQZ3My5WikDcXANtyXexIF/AT8ZlljmwmDZ5Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649216472; a=rsa-sha256; cv=none; b=ye5ZmLH1IdZ7qrHtAD68R0kk4OSxc7sDvfX/FJlTxhbZstURZP87rES2E59urCSa7fB9Xk njcPHT2qN4DFjk+OsJLh4YAH94ts2MOI/VbJrenSRbwTJa4cSoGHBDfznQWwVQhZVovsGP j0W1Th4aS96hYLNH6CHE+ur76Sn8bkhAHdTNERhgfP+Orp6ZHNqWa6/SnOrFxvQciqWCd0 Fc1gEP5LhRpmEbHQ/P+SJzSEttZsLO8pvFBRRzKkycFUO0HesJzgJfBumHB5Z1bx1JuhvF pM+iriAbwGnlCEvX99ZgQgIa6HgccEeo11i4wnb2KB2iMu4fZXgxYoELAneBPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6bbc09343aba7118b033da5980472483622aa572 commit 6bbc09343aba7118b033da5980472483622aa572 Author: Kyle Evans AuthorDate: 2022-03-31 19:19:52 +0000 Commit: Kyle Evans CommitDate: 2022-04-06 03:36:09 +0000 libbe: pull props for the correct dataset in be_mounted_at() The props feature to this API was added as a "just in case", with no planned consumer. It turns out that it was implemented incorrectly, tapping out props for the BE root (BE's parent) rather than the BE itself in all cases. Fetch properties for the dataset that's actually mounted at the queried path. Reported by: Christian McDonald (cherry picked from commit 31190aa02eef05b1b58ba89212dc8c8738770e37) --- lib/libbe/be_access.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libbe/be_access.c b/lib/libbe/be_access.c index 74059a0a5693..9f7ad32599ac 100644 --- a/lib/libbe/be_access.c +++ b/lib/libbe/be_access.c @@ -210,7 +210,7 @@ be_mounted_at(libbe_handle_t *lbh, const char *path, nvlist_t *details) if (info.name != NULL) { if (details != NULL) { - if ((root_hdl = zfs_open(lbh->lzh, lbh->root, + if ((root_hdl = zfs_open(lbh->lzh, info.name, ZFS_TYPE_FILESYSTEM)) == NULL) { free(info.name); return (BE_ERR_ZFSOPEN);