From owner-freebsd-fs@FreeBSD.ORG Sun Jul 27 18:11:18 2008 Return-Path: Delivered-To: freebsd-fs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D09CE106564A; Sun, 27 Jul 2008 18:11:18 +0000 (UTC) (envelope-from nork@FreeBSD.org) Received: from sakura.ninth-nine.com (unknown [IPv6:2001:2f0:104:80a0:230:48ff:fe41:2455]) by mx1.freebsd.org (Postfix) with ESMTP id 6B2438FC15; Sun, 27 Jul 2008 18:11:18 +0000 (UTC) (envelope-from nork@FreeBSD.org) Received: from nadesico.ninth-nine.com (nadesico.ninth-nine.com [219.127.74.122]) by sakura.ninth-nine.com (8.14.1/8.14.1/NinthNine) with SMTP id m6RIBGKW066920; Mon, 28 Jul 2008 03:11:16 +0900 (JST) (envelope-from nork@FreeBSD.org) Date: Mon, 28 Jul 2008 03:11:15 +0900 From: Norikatsu Shigemura To: Pawel Jakub Dawidek Message-Id: <20080728031115.b0ac0d07.nork@FreeBSD.org> In-Reply-To: <20080727125413.GG1345@garage.freebsd.pl> References: <20080727125413.GG1345@garage.freebsd.pl> X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.11; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 (sakura.ninth-nine.com [219.127.74.121]); Mon, 28 Jul 2008 03:11:16 +0900 (JST) Cc: freebsd-fs@FreeBSD.org, freebsd-current@FreeBSD.org, Norikatsu Shigemura Subject: Re: ZFS patches. 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 Jul 2008 18:11:19 -0000 On Sun, 27 Jul 2008 14:54:13 +0200 Pawel Jakub Dawidek wrote: > Please test, test, test. If I get enough positive feedback, I may be > able to squeeze it into 7.1-RELEASE, but this might be hard. I read your patch. So I don't test, yet. But I noticed a minor issue of your patch. * NO NEED FOLLOWING PATCH * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S.orig 2008-03-29 07:16:08.000000000 +0900 +++ sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S 2008-07-28 01:54:52.314417185 +0900 @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S,v 1.3 2008/03/28 22:16:08 jb Exp $ + * $FreeBSD: src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S,v 1.2 2007/06/08 16:20:03 marcel Exp $ */ #include - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - I'm using following patch: 1. To support zpool for lsdev. 2. To support case of "slice has only zpool and no bsd partition". I don't test on new zfs, yet. I'll try to test it, too. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --- sys/boot/i386/libi386/biosdisk.c~ 2008-02-29 02:49:23.000000000 +0900 +++ sys/boot/i386/libi386/biosdisk.c 2008-03-18 09:15:34.209096127 +0900 @@ -469,6 +469,7 @@ * unused. */ if ((lp->d_partitions[i].p_fstype == FS_BSDFFS) || + (lp->d_partitions[i].p_fstype == FS_ZFS) || (lp->d_partitions[i].p_fstype == FS_SWAP) || (lp->d_partitions[i].p_fstype == FS_VINUM) || ((lp->d_partitions[i].p_fstype == FS_UNUSED) && @@ -477,6 +478,7 @@ /* Only print out statistics in verbose mode */ if (verbose) sprintf(line, " %s%c: %s %s (%d - %d)\n", prefix, 'a' + i, + (lp->d_partitions[i].p_fstype == FS_ZFS) ? "ZFS " : (lp->d_partitions[i].p_fstype == FS_SWAP) ? "swap " : (lp->d_partitions[i].p_fstype == FS_VINUM) ? "vinum" : "FFS ", @@ -485,6 +487,7 @@ lp->d_partitions[i].p_offset + lp->d_partitions[i].p_size); else sprintf(line, " %s%c: %s\n", prefix, 'a' + i, + (lp->d_partitions[i].p_fstype == FS_ZFS) ? "ZFS" : (lp->d_partitions[i].p_fstype == FS_SWAP) ? "swap" : (lp->d_partitions[i].p_fstype == FS_VINUM) ? "vinum" : "FFS"); @@ -696,7 +699,12 @@ if (lp->d_magic != DISKMAGIC) { DEBUG("no disklabel"); +#if 0 return (ENOENT); +#else + od->od_flags &= ~BD_LABELOK; + od->od_boff = sector; /* no partition, must be after the slice */ +#endif } if (dev->d_kind.biosdisk.partition >= lp->d_npartitions) { DEBUG("partition '%c' exceeds partitions in table (a-'%c')", - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -