From owner-svn-src-head@freebsd.org Tue Nov 5 18:35:13 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F11281B06FD; Tue, 5 Nov 2019 18:35:13 +0000 (UTC) (envelope-from tsoome@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 476yyT6By8z3NhZ; Tue, 5 Nov 2019 18:35:13 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B920518EC7; Tue, 5 Nov 2019 18:35:13 +0000 (UTC) (envelope-from tsoome@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA5IZDOW021053; Tue, 5 Nov 2019 18:35:13 GMT (envelope-from tsoome@FreeBSD.org) Received: (from tsoome@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA5IZD1d021051; Tue, 5 Nov 2019 18:35:13 GMT (envelope-from tsoome@FreeBSD.org) Message-Id: <201911051835.xA5IZD1d021051@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tsoome set sender to tsoome@FreeBSD.org using -f From: Toomas Soome Date: Tue, 5 Nov 2019 18:35:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354364 - head/stand/libsa/zfs X-SVN-Group: head X-SVN-Commit-Author: tsoome X-SVN-Commit-Paths: head/stand/libsa/zfs X-SVN-Commit-Revision: 354364 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2019 18:35:14 -0000 Author: tsoome Date: Tue Nov 5 18:35:13 2019 New Revision: 354364 URL: https://svnweb.freebsd.org/changeset/base/354364 Log: loader: clean up the noise around log device We are ignoring log device but we also do want to have clean code. Modified: head/stand/libsa/zfs/zfs.c head/stand/libsa/zfs/zfsimpl.c Modified: head/stand/libsa/zfs/zfs.c ============================================================================== --- head/stand/libsa/zfs/zfs.c Tue Nov 5 18:07:30 2019 (r354363) +++ head/stand/libsa/zfs/zfs.c Tue Nov 5 18:35:13 2019 (r354364) @@ -669,14 +669,6 @@ zfs_dev_open(struct open_file *f, ...) spa = spa_find_by_guid(dev->pool_guid); if (!spa) return (ENXIO); -#if 0 - /* Apparently too many are using slog with boot pool. */ - if (spa->spa_with_log) { - printf("Reading pool %s is not supported due to log device.\n", - spa->spa_name); - return (ENXIO); - } -#endif mount = malloc(sizeof(*mount)); if (mount == NULL) rv = ENOMEM; Modified: head/stand/libsa/zfs/zfsimpl.c ============================================================================== --- head/stand/libsa/zfs/zfsimpl.c Tue Nov 5 18:07:30 2019 (r354363) +++ head/stand/libsa/zfs/zfsimpl.c Tue Nov 5 18:35:13 2019 (r354364) @@ -1774,12 +1774,6 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, s return (EIO); } - if (nvlist_find(nvlist, ZPOOL_CONFIG_IS_LOG, DATA_TYPE_UINT64, - NULL, &val) == 0 && val != 0) { - free(nvlist); - return (EIO); - } - /* * Create the pool if this is the first time we've seen it. */ @@ -1854,9 +1848,6 @@ vdev_probe(vdev_phys_read_t *_read, void *read_priv, s return (EIO); } - /* - * We do not support reading pools with log device. - */ if (vdev->v_islog) spa->spa_with_log = vdev->v_islog;