From owner-cvs-src@FreeBSD.ORG Sat Apr 21 12:02:58 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1727A16A400; Sat, 21 Apr 2007 12:02:58 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 073C713C4BA; Sat, 21 Apr 2007 12:02:58 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3LC2vLV045948; Sat, 21 Apr 2007 12:02:57 GMT (envelope-from pjd@repoman.freebsd.org) Received: (from pjd@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3LC2vul045946; Sat, 21 Apr 2007 12:02:57 GMT (envelope-from pjd) Message-Id: <200704211202.l3LC2vul045946@repoman.freebsd.org> From: Pawel Jakub Dawidek Date: Sat, 21 Apr 2007 12:02:57 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/contrib/opensolaris/cmd/zdb zdb.c src/contrib/opensolaris/lib/libzfs/common libzfs_changelist.c libzfs_config.c libzfs_import.c src/sys/compat/opensolaris/kern opensolaris_vfs.c src/sys/contrib/opensolaris/uts/common/fs/zfs spa.c vdev.c zfs_vnops.c zio.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Apr 2007 12:02:58 -0000 pjd 2007-04-21 12:02:57 UTC FreeBSD src repository Modified files: contrib/opensolaris/cmd/zdb zdb.c contrib/opensolaris/lib/libzfs/common libzfs_changelist.c libzfs_config.c libzfs_import.c sys/compat/opensolaris/kern opensolaris_vfs.c sys/contrib/opensolaris/uts/common/fs/zfs spa.c vdev.c zfs_vnops.c zio.c Log: MFp4: @118370 Correct typo. @118371 Integrate changes from vendor. @118491 Show backtrace on unexpected code paths. @118494 Integrate changes from vendor. @118504 Fix sendfile(2). I had two ways of fixing it: 1. Fixing sendfile(2) itself to use VOP_GETPAGES() instead of hacking around with vn_rdwr(UIO_NOCOPY), which was suggested by ups. 2. Modify ZFS behaviour to handle this special case. Although 1 is more correct, I've choosen 2, because hack from 1 have a side-effect of beeing faster - it reads ahead MAXBSIZE bytes instead of reading page by page. This is not easy to implement with VOP_GETPAGES(), at least not for me in this very moment. Reported by: Andrey V. Elsukov @118525 Reorganize the code to reduce diff. @118526 This code path is expected. It is simply when file is opened with O_FSYNC flag. Reported by: kris Reported by: Michal Suszko Revision Changes Path 1.2 +6 -6 src/contrib/opensolaris/cmd/zdb/zdb.c 1.2 +4 -11 src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c 1.2 +7 -21 src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c 1.3 +1 -3 src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c 1.4 +2 -2 src/sys/compat/opensolaris/kern/opensolaris_vfs.c 1.6 +3 -6 src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c 1.2 +2 -2 src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c 1.3 +19 -9 src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c 1.2 +13 -7 src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c