From owner-cvs-src-old@FreeBSD.ORG Mon Oct 18 08:56:00 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 982A1106566B for ; Mon, 18 Oct 2010 08:56:00 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 664A58FC12 for ; Mon, 18 Oct 2010 08:56:00 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o9I8u0Ql039792 for ; Mon, 18 Oct 2010 08:56:00 GMT (envelope-from mm@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o9I8u0px039789 for cvs-src-old@freebsd.org; Mon, 18 Oct 2010 08:56:00 GMT (envelope-from mm@repoman.freebsd.org) Message-Id: <201010180856.o9I8u0px039789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to mm@repoman.freebsd.org using -f From: Martin Matuska Date: Mon, 18 Oct 2010 08:54:33 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/cddl/contrib/opensolaris/cmd/zinject zinject.c src/cddl/contrib/opensolaris/cmd/zpool zpool_main.c src/cddl/contrib/opensolaris/lib/libzfs/common libzfs.h libzfs_pool.c libzfs_util.c src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs dsl_scrub.c spa.c vdev.c vdev_disk.c vdev_label.c zfs_fm.c zil.c ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Oct 2010 08:56:00 -0000 mm 2010-10-18 08:54:33 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) cddl/contrib/opensolaris/cmd/zinject zinject.c cddl/contrib/opensolaris/cmd/zpool zpool_main.c cddl/contrib/opensolaris/lib/libzfs/common libzfs.h libzfs_pool.c libzfs_util.c sys/cddl/contrib/opensolaris/uts/common/fs/zfs dsl_scrub.c spa.c vdev.c vdev_disk.c vdev_label.c zfs_fm.c zil.c zio.c zio_inject.c sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys vdev.h vdev_impl.h zfs_ioctl.h zil.h zio.h Log: SVN rev 214013 on 2010-10-18 08:54:33Z by mm MFC r213197, r213198: MFC r213197: Enable offlining of log devices. OpenSolaris revision and Bug IDs: 9701:cc5b64682e64 6803605 should be able to offline log devices 6726045 vdev_deflate_ratio is not set when offlining a log device 6599442 zpool import has faults in the display MFC r213198: Properly handle IO with B_FAILFAST Retry IO once with ZIO_FLAG_TRYHARD before declaring a pool faulted OpenSolaris revision and Bug IDs: 9725:0bf7402e8022 6843014 ZFS B_FAILFAST handling is broken As FreeBSD does not support B_FAILFAST and we don't use vdev_disk.c, MFC of r213198 is a no-op with the purpose of diff reduction against latest ZFS code and making future updates easier. Approved by: delphij (mentor) Obtained from: OpenSolaris (Bug ID 6803605, 6726045, 6599442, 6843014) Revision Changes Path 1.2.4.1 +6 -5 src/cddl/contrib/opensolaris/cmd/zinject/zinject.c 1.4.2.4 +220 -220 src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c 1.6.2.5 +1 -0 src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h 1.3.2.4 +6 -0 src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c 1.6.2.2 +3 -0 src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c 1.1.4.5 +1 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c 1.9.2.7 +38 -8 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c 1.3.2.3 +3 -2 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h 1.3.2.2 +1 -0 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h 1.4.2.2 +1 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h 1.3.2.3 +1 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h 1.3.2.5 +30 -27 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h 1.7.2.4 +90 -29 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c 1.3.2.2 +3 -2 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c 1.3.2.2 +27 -5 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c 1.6.2.2 +9 -0 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c 1.6.2.6 +36 -40 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c 1.8.2.7 +2 -1 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c 1.3.2.1 +8 -2 src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c