From nobody Wed Apr 06 14:33:17 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 2A05E1A95BA6; Wed, 6 Apr 2022 14:33:18 +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 4KYRnp0VtMz3Qmb; Wed, 6 Apr 2022 14:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649255598; 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=JqsVgF2qhTZ9BadHU9O6ZCiVJai71JOp9S11Ax4lfmk=; b=jOqfs0CQ8Bb1SgwGC2Rzcj5xqu9Q5AyihGhiyGCwOo0v5QWp9Dknm6vYnnvvGYdKNplAlx Rp9DNqKVJX1eHBifcNnkASsdL51VQWmp9YDZ0gK4W/EGq9uBJzf8dyIYF44nsOhnLB7FU0 Rvy1+k9Jw570Jbzizip9p9dQG8UmeCrGUJ3dnYgWciDMF2ss6Vg3VYQCG8d7ms7A8Ydz9q 1d+JAwaF6Lc3qjDW0H9T3cCPb2beBOQKUTc/Sg+VzANizbLP5U7NDVTpuIdAjZ/Cb3m1MF eST4FEc4lmgp8DyUJ0X55EtuaG9zgmkDikDkxA85QUx68f42WvVfon9n1W5Zsg== 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 E2D701CF1C; Wed, 6 Apr 2022 14:33:17 +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 236EXHUI066229; Wed, 6 Apr 2022 14:33:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 236EXHWx066227; Wed, 6 Apr 2022 14:33:17 GMT (envelope-from git) Date: Wed, 6 Apr 2022 14:33:17 GMT Message-Id: <202204061433.236EXHWx066227@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: b8f5e2765d63 - releng/13.1 - 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/releng/13.1 X-Git-Reftype: branch X-Git-Commit: b8f5e2765d6322e7a31ad98605a4056be2b8c7d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649255598; 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=JqsVgF2qhTZ9BadHU9O6ZCiVJai71JOp9S11Ax4lfmk=; b=s7tEFyhWxohqUPJKEeU52vwVXJ1Z8/m2jx4T1ZBtbBRAEGDQYURAw29QgoW0NZd6AkJSJ+ fYbsfUOmSCZDj9xxKuBeEchvabFvnjNBO7d5HyJZNYJXtzIkAJXwKd0ck+VH6bxWr82RBD ReHJW/IUA98La4mOn6yMl3if2uLcCwO0SXGvVmgdYpeSO42NgYzJk/oFDaFpnRCT/tKBMJ xt29nXvTBE+i6g3ct6kIxodK2c0a2+6RSAM0h7VZ2nYv1tg1jttorcKCShbTsN+OuGU6Bw iL7I2Qmms1HC1J480uBTbmOGn0IQ0aOiCuG9R9iW1dHaLuVxf+WFmoAhaVJEuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649255598; a=rsa-sha256; cv=none; b=q8PT9Clj/SfzgJFjw9oZTvK1kaAphUfuZG3kECyHZJmITJEJaNpYWuEUnRGtIIgWLl/Jsi HnCiV/GyMiP9TZe3mJgtMFPNJFX3Fs3a/rTDb9/rjhAQPT7y7q58Muw9ay1dmm+U0FqtWZ LB7V6OOcSpDBO7inlTTZ6Gq0Ot6xRmpHN4l3gsvKqiVyjsFFbxOUxIJSP/puQb04+l7wzT Da9/XEfEceBODSpItN2b1+AGRjTzBZ7znSOMV4SE3NHKdlr4d3hNLYH4PKXWUmazWX7PMy G9OWZxbX+PeC7oySqQheGgXsVAEcQy0k6LNhaW/cZiTVKK+6rRYX0kvw6gwNdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b8f5e2765d6322e7a31ad98605a4056be2b8c7d7 commit b8f5e2765d6322e7a31ad98605a4056be2b8c7d7 Author: Kyle Evans AuthorDate: 2022-03-31 19:19:52 +0000 Commit: Kyle Evans CommitDate: 2022-04-06 14:32:31 +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. Approved by: re (gjb) Reported by: Christian McDonald (cherry picked from commit 31190aa02eef05b1b58ba89212dc8c8738770e37) (cherry picked from commit bed9c972aee7aa5ac916f24d60d9dbd109897856) --- 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);