From nobody Mon May 01 21:04:12 2023 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 4Q9G0r6g9Tz491Xn; Mon, 1 May 2023 21:04: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 4Q9G0r3h96z3HqH; Mon, 1 May 2023 21:04:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975052; 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=r9fofuUvWy42TVqtSfNQcJKL+g81fCnTkBliklDSAhQ=; b=fYfKRryiWrAtNwLN6QvhWfhs6AK7NCjqYkKEQz6u1alFpUdSlyLMk7FEkHbh8b720G1YjC IQB0gzO2ptrQ2CkUnC6HI1v4YMculDJd2oHF5RH4SOG7c+5EYEuQwYDV4Aa7pquL/eqm+A yAzK7NOsvbu2yIe9ESRdhBA9NVYxrWqLQV+Rv0xNkGGLZJzToOEMbXo17RVqqXKmmP8uVu GNVsBN6S7Jz424lD0GZdVSCbXV5GVcfJy6OfcwmkPwvDG1sbl3K7wb4shc5famxS6eIUdv mJKzXmHSMfADEy78aq8mIObvcbEPgO4ICsLt3hgzwXUTU5f9hcJqkWVs/xZ1dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682975052; 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=r9fofuUvWy42TVqtSfNQcJKL+g81fCnTkBliklDSAhQ=; b=oYc8m/yKS//zvd7KD/mw4PTtTLiMcR6CxWw85Z4Vd86uFhoaszQAiQwZguWQ/+x2zjx0QT WZSsWialDXU5YId3r0dk/Jl6m5kGGbYuv0aGwuB21DJOdDRtsUoMUZQqXHY8u7G3TfIHDW 2ijhCoVkKJ2yFrlCKzo7iw9thd4Kt8fy4ZzS7gHcYX6y+YLDfhn3v+RyR6OQNwkbATEmmR 8VbxE3KkqK5G4QwkfhEQNld07YbH2WUwPyx/NxqQWuzt7cDfe+8cbDhfp6wXYovhZ5yvq/ Yd+aMrYKNWbTweYV0Vt7tDTpL5b9UzKzHOEv7NL8icSsoQjWZiGv0uNTuAyQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682975052; a=rsa-sha256; cv=none; b=gMo9u+OCXrKaxxWyfsf1Je5KabugwvRjwDXZaVmV4WH7Y11Ua52aDpr6BhyxXAh06qx+cO f7pDqxkxthylRmyLsdoXVy23jxfScuMjcOITFanMC9+aOwdBxaxrQs532vL0rjLwT3CGF4 PerCo2JxgqQL5/8yuhaeNK3MJLcM3Cq14JmgUXhAO/26Ic01uGcRrVp1hhhOnrDxmioQAw nPmLiBEbFVxVOiFu+fY8QqatkiM/efxpNFOhHJ1RVtrOnZuoUSp2+gnxsqKVr5f6iInqfo kTTmjI4fmkEJRfj4fSO1LPiErfk0DuaY/Wzr3slx3SSlnMlHw2uZMGhylrhi8g== 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 4Q9G0r2lghzL2g; Mon, 1 May 2023 21:04:12 +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 341L4Cp2051739; Mon, 1 May 2023 21:04:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341L4ClE051738; Mon, 1 May 2023 21:04:12 GMT (envelope-from git) Date: Mon, 1 May 2023 21:04:12 GMT Message-Id: <202305012104.341L4ClE051738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 439a9766adba - main - stand/zfs: Move spa_find_by_dev from zfsimpl.c to zfs.c 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 439a9766adbabcdfcce9fb0396b43c9e1482155a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=439a9766adbabcdfcce9fb0396b43c9e1482155a commit 439a9766adbabcdfcce9fb0396b43c9e1482155a Author: Warner Losh AuthorDate: 2023-05-01 15:26:44 +0000 Commit: Warner Losh CommitDate: 2023-05-01 21:02:52 +0000 stand/zfs: Move spa_find_by_dev from zfsimpl.c to zfs.c zfsimpl.c doesn't know about devdesc at all, but zfs.c does. Move it to zfs.c, which is the only user. Keep it static for now, but it could be exposed later if something else were to need it. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D39408 --- stand/libsa/zfs/zfs.c | 13 +++++++++++++ stand/libsa/zfs/zfsimpl.c | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stand/libsa/zfs/zfs.c b/stand/libsa/zfs/zfs.c index 3d5a392dd03f..4a4d3cf26843 100644 --- a/stand/libsa/zfs/zfs.c +++ b/stand/libsa/zfs/zfs.c @@ -373,6 +373,19 @@ zfs_readdir(struct open_file *f, struct dirent *d) } } +static spa_t * +spa_find_by_dev(struct zfs_devdesc *dev) +{ + + if (dev->dd.d_dev->dv_type != DEVT_ZFS) + return (NULL); + + if (dev->pool_guid == 0) + return (STAILQ_FIRST(&zfs_pools)); + + return (spa_find_by_guid(dev->pool_guid)); +} + /* * if path is NULL, create mount structure, but do not add it to list. */ diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 4a285470642e..29e8bb82b6e2 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1367,19 +1367,6 @@ spa_find_by_name(const char *name) return (NULL); } -static spa_t * -spa_find_by_dev(struct zfs_devdesc *dev) -{ - - if (dev->dd.d_dev->dv_type != DEVT_ZFS) - return (NULL); - - if (dev->pool_guid == 0) - return (STAILQ_FIRST(&zfs_pools)); - - return (spa_find_by_guid(dev->pool_guid)); -} - static spa_t * spa_create(uint64_t guid, const char *name) {