From owner-svn-src-head@FreeBSD.ORG  Tue Jul 22 09:02:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C897AC76;
 Tue, 22 Jul 2014 09:02:23 +0000 (UTC)
Received: from smtp1.multiplay.co.uk (smtp1.multiplay.co.uk [85.236.96.35])
 by mx1.freebsd.org (Postfix) with ESMTP id 8C4272DCD;
 Tue, 22 Jul 2014 09:02:23 +0000 (UTC)
Received: by smtp1.multiplay.co.uk (Postfix, from userid 65534)
 id 7254C20E7088C; Tue, 22 Jul 2014 09:02:16 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 smtp1.multiplay.co.uk
X-Spam-Level: **
X-Spam-Status: No, score=2.2 required=8.0 tests=AWL,BAYES_00,DOS_OE_TO_MX,
 FSL_HELO_NON_FQDN_1,HELO_NO_DOMAIN,RDNS_DYNAMIC,STOX_REPLY_TYPE autolearn=no
 version=3.3.1
Received: from r2d2 (82-69-141-170.dsl.in-addr.zen.co.uk [82.69.141.170])
 by smtp1.multiplay.co.uk (Postfix) with ESMTPS id 2731520E70886;
 Tue, 22 Jul 2014 09:02:11 +0000 (UTC)
Message-ID: <6B8002A135E04714BC8E5F3B41DD2AFF@multiplay.co.uk>
From: "Steven Hartland" <killing@multiplay.co.uk>
To: "Xin LI" <delphij@FreeBSD.org>, <src-committers@freebsd.org>,
 <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org>
References: <201407220837.s6M8b12u057751@svn.freebsd.org>
Subject: Re: svn commit: r268980 -
 head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys
Date: Tue, 22 Jul 2014 10:02:10 +0100
MIME-Version: 1.0
Content-Type: text/plain; format=flowed; charset="utf-8"; reply-type=original
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2900.5931
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.6157
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jul 2014 09:02:23 -0000

Nice catch, that could well be the cause of the "Solaris Assert/zio.c:2548" panics don't you
think?

    Regards
    Steve

----- Original Message ----- 
From: "Xin LI" <delphij@FreeBSD.org>
To: <src-committers@freebsd.org>; <svn-src-all@freebsd.org>; <svn-src-head@freebsd.org>
Sent: Tuesday, July 22, 2014 9:37 AM
Subject: svn commit: r268980 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys


> Author: delphij
> Date: Tue Jul 22 08:37:01 2014
> New Revision: 268980
> URL: http://svnweb.freebsd.org/changeset/base/268980
> 
> Log:
>  Correct typo introduced with r268855.
>  
>  MFC after: 10 days
>  X-MFC with: r268855
> 
> Modified:
>  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
> 
> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
> ==============================================================================
> --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Tue Jul 22 06:40:27 2014 (r268979)
> +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h Tue Jul 22 08:37:01 2014 (r268980)
> @@ -208,7 +208,7 @@ enum zio_flag {
>  ZIO_FLAG_NOPWRITE = 1 << 26,
>  ZIO_FLAG_REEXECUTED = 1 << 27,
>  ZIO_FLAG_DELEGATED = 1 << 28,
> - ZIO_FLAG_QUEUE_IO_DONE = 1 << 28,
> + ZIO_FLAG_QUEUE_IO_DONE = 1 << 29,
> };
> 
> #define ZIO_FLAG_MUSTSUCCEED 0
> 
>