From owner-freebsd-fs@FreeBSD.ORG  Mon Jul 26 12:00:18 2010
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CFED01065714
	for <freebsd-fs@hub.freebsd.org>; Mon, 26 Jul 2010 12:00:18 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id AA4A88FC22
	for <freebsd-fs@hub.freebsd.org>; Mon, 26 Jul 2010 12:00:18 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o6QC0IZR036141
	for <freebsd-fs@freefall.freebsd.org>; Mon, 26 Jul 2010 12:00:18 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o6QC0I1h036140;
	Mon, 26 Jul 2010 12:00:18 GMT (envelope-from gnats)
Date: Mon, 26 Jul 2010 12:00:18 GMT
Message-Id: <201007261200.o6QC0I1h036140@freefall.freebsd.org>
To: freebsd-fs@FreeBSD.org
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Cc: 
Subject: Re: bin/148296: [zfs] [loader] [patch] Very slow probe in
 /usr/src/sys/boot/zfs/zfs.c
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Jimmy Olgeni <olgeni@FreeBSD.org>
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jul 2010 12:00:18 -0000

The following reply was made to PR bin/148296; it has been noted by GNATS.

From: Jimmy Olgeni <olgeni@FreeBSD.org>
To: "Andrey V. Elsukov" <bu7cher@yandex.ru>
Cc: bug-followup@FreeBSD.org, Andriy Gapon <avg@icyb.net.ua>,
        Norikatsu Shigemura <nork@FreeBSD.org>
Subject: Re: bin/148296: [zfs] [loader] [patch] Very slow probe in
 /usr/src/sys/boot/zfs/zfs.c
Date: Mon, 26 Jul 2010 13:56:03 +0200 (CEST)

 Hello,
 
 On Wed, 14 Jul 2010, Andrey V. Elsukov wrote:
 
 > just one note - user can create partition that doesn't start from 1.
 > For example:
 > 	# mdconfig -s 100m
 > 	# gpart create -s gpt md0
 > 	# gpart add -i 5 -t freebsd-zfs md0
 
 This is slower, but safer: it doesn't fall back to slices, and only 
 skips checks when a vdev is found at the unit level.
 
 --- zfs.c.orig	2010-06-14 04:09:06.000000000 +0200
 +++ zfs.c	2010-07-26 13:37:23.490536162 +0200
 @@ -408,20 +408,27 @@
 
   		/*
   		 * If we find a vdev, the zfs code will eat the fd, otherwise
 -		 * we close it.
 +		 * we close it and check for vdevs in slices and partitions.
   		 */
   		if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
   			close(fd);
 +		else
 +			continue;
 +
 +		for (slice = 1; slice <= 4; slice++) {
 +			sprintf(devname, "disk%ds%d:", unit, slice);
 +			fd = open(devname, O_RDONLY);
 +			if (fd == -1)
 +				continue;
 +			if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
 +				close(fd);
 +		}
 
   		for (slice = 1; slice <= 128; slice++) {
   			sprintf(devname, "disk%dp%d:", unit, slice);
   			fd = open(devname, O_RDONLY);
 -			if (fd == -1) {
 -				sprintf(devname, "disk%ds%d:", unit, slice);
 -				fd = open(devname, O_RDONLY);
 -				if (fd == -1)
 -					continue;
 -			}
 +			if (fd == -1)
 +				continue;
   			if (vdev_probe(vdev_read, (void*) (uintptr_t) fd, 0))
   				close(fd);
   		}