From owner-freebsd-fs@FreeBSD.ORG Sun Feb 27 23:00:25 2011 Return-Path: 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 CD1341065670 for ; Sun, 27 Feb 2011 23:00:25 +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 8EC788FC17 for ; Sun, 27 Feb 2011 23:00:25 +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 p1RN0Pj4086566 for ; Sun, 27 Feb 2011 23:00:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1RN0P1A086549; Sun, 27 Feb 2011 23:00:25 GMT (envelope-from gnats) Resent-Date: Sun, 27 Feb 2011 23:00:25 GMT Resent-Message-Id: <201102272300.p1RN0P1A086549@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-fs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22E7E106564A for ; Sun, 27 Feb 2011 22:55:16 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ww0-f50.google.com (mail-ww0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id ACCC48FC12 for ; Sun, 27 Feb 2011 22:55:15 +0000 (UTC) Received: by wwb31 with SMTP id 31so4323849wwb.31 for ; Sun, 27 Feb 2011 14:55:14 -0800 (PST) Received: by 10.227.23.200 with SMTP id s8mr1113040wbb.196.1298847314026; Sun, 27 Feb 2011 14:55:14 -0800 (PST) Received: from localhost (tor-exit-router36-readme.formlessnetworking.net [199.48.147.36]) by mx.google.com with ESMTPS id o6sm2761295wbo.9.2011.02.27.14.55.11 (version=SSLv3 cipher=OTHER); Sun, 27 Feb 2011 14:55:13 -0800 (PST) Message-Id: <86ipw5xf3r.fsf@gmail.com> Date: Mon, 28 Feb 2011 01:55:04 +0300 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: bin/155104: [zfs][patch] use /dev prefix by default when importing X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Feb 2011 23:00:25 -0000 >Number: 155104 >Category: bin >Synopsis: [zfs][patch] use /dev prefix by default when importing >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-fs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 27 23:00:24 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: >Description: Don't use Solaris prefix /dev/dsk when trying zpool_{find,search}_import() without arguments. cf. http://docs.freebsd.org/cgi/mid.cgi?86lj1s3pv0.fsf >How-To-Repeat: $ zdb -e tank >Fix: --- a.diff begins here --- Index: cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c =================================================================== --- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c (revision 219090) +++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c (working copy) @@ -1129,7 +1129,11 @@ zpool_find_import_impl(libzfs_handle_t *hdl, impor char *end, **dir = iarg->path; size_t pathleft; nvlist_t *ret = NULL; +#ifdef sun static char *default_dir = "/dev/dsk"; +#else + static char *default_dir = "/dev"; +#endif pool_list_t pools = { 0 }; pool_entry_t *pe, *penext; vdev_entry_t *ve, *venext; --- a.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: