From owner-freebsd-current@FreeBSD.ORG Wed Jul 7 19:51:59 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B856106564A; Wed, 7 Jul 2010 19:51:59 +0000 (UTC) (envelope-from sfourman@gmail.com) Received: from mail-gx0-f182.google.com (mail-gx0-f182.google.com [209.85.161.182]) by mx1.freebsd.org (Postfix) with ESMTP id 071B78FC1A; Wed, 7 Jul 2010 19:51:58 +0000 (UTC) Received: by gxk24 with SMTP id 24so15889gxk.13 for ; Wed, 07 Jul 2010 12:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type; bh=yY0Ccx4Qc1aNsWEj83IwUhaDliguYsnNcScOZfXJPwA=; b=H2e7FtVeP3ezDxBEKQATki/QnH6VwyY9RLqfLEUnVVGc/31zMGmz/m/jnhN9GO67zk dXmdAVgRMTfyA2pjs1StTIo4d1J67mFrYM9hqchvqmXzE8kqF7ceDH+pagwdG3l6jSjj Rq9Ypf7cEX+LxHZi6JQ0Rz0cXNodXMxs/1Fbw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=eksaiaSeZrfWFwgmiTWQDFiRKi6teDeWUsbfmVFaG+96537JVlrYWFC6IVDIYXwPXj OcJfdETag/np2cFJHlrae4m71cJL7ISY4/3N3Q8o+yu3cfPSGyHs9EoCmvQojCefxJ1s nXkjC+Z+fjr9J4+DNvx7MSRP2PuiR03QMvZMo= MIME-Version: 1.0 Received: by 10.229.189.143 with SMTP id de15mr4133125qcb.270.1278532315718; Wed, 07 Jul 2010 12:51:55 -0700 (PDT) Received: by 10.229.240.209 with HTTP; Wed, 7 Jul 2010 12:51:55 -0700 (PDT) In-Reply-To: <4C31C71C.2010606@FreeBSD.org> References: <4C31C71C.2010606@FreeBSD.org> Date: Wed, 7 Jul 2010 14:51:55 -0500 Message-ID: From: "Sam Fourman Jr." To: Martin Matuska Content-Type: text/plain; charset=ISO-8859-1 Cc: freebsd-current@freebsd.org Subject: Re: [CFT] ZFS v15 patch (version 3) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jul 2010 19:51:59 -0000 2010/7/5 Martin Matuska : > Dear FreeBSD community, > > there has been a ZFS-related discussion at the meetBSD conference in > Krakow, Poland and we agreed to push ZFS version 15 (and not 16) to > -CURRENT. > > An upgrade to version 16 gives us no valuable features (to be true, no > features at all besides ability to import v16 pools). > As ZFS v15 is already being used in the Solaris 10 enterprise world, we > can consider it well-tested. > > The goal is to provide a filesystem compatible with Solaris 10 update 8, > which may attract new users to FreeBSD. > Existing users will get the userquota/groupquota features for ZFS and be > able to import Solaris 10 update 8 pools. > > Import was done by walking through the path of bugfixes from Solaris 10, > including pre-v15 bugfixes and almost all post-v15 bugfixes. > Few patches are irrelevant to our code (Solaris-specific features) or > modify the zvol part, these have been left out. > > I have prepared a new patch that includes almost all revision numbers > Solaris 10 has integrated (we have several of the revisions already in > our tree). > Patch also includes updated manpages and may be considered as a > candidate for head. > > Link to the patch information file, including all imported revisions, > bug-ids and reference to Solairis 10 patch numbers: > http://people.freebsd.org/~mm/patches/zfs/v15/head-v15-v3.html > http://people.freebsd.org/~mm/patches/zfs/v15/head-v15-v3.txt > > Direct link to the patch: > http://people.freebsd.org/~mm/patches/zfs/v15/head-v15-v3.patch > > The patch applies cleanly against head and stable/8. using head from 3 hours ago, this patch does not apply cleanly http://people.freebsd.org/~mm/patches/zfs/v15/head-v15-v3-extension.patch FNFS# cat sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c.rej *************** *** 529,540 **** if ((flag & (FSYNC | FDSYNC)) && (count == 1)) atomic_dec_32(&zp->z_sync_cnt); - /* - * Clean up any locks held by this process on the vp. - */ - cleanlocks(vp, ddi_get_pid(), 0); - cleanshares(vp, ddi_get_pid()); - if (!zfs_has_ctldir(zp) && zp->z_zfsvfs->z_vscan && ZTOV(zp)->v_type == VREG && !(zp->z_phys->zp_flags & ZFS_AV_QUARANTINED) && --- 535,540 ---- if ((flag & (FSYNC | FDSYNC)) && (count == 1)) atomic_dec_32(&zp->z_sync_cnt); if (!zfs_has_ctldir(zp) && zp->z_zfsvfs->z_vscan && ZTOV(zp)->v_type == VREG && !(zp->z_phys->zp_flags & ZFS_AV_QUARANTINED) && *************** *** 1055,1060 **** &acl_ids)) != 0) goto out; if (zfs_acl_ids_overquota(zfsvfs, &acl_ids)) { error = EDQUOT; goto out; } --- 1101,1107 ---- &acl_ids)) != 0) goto out; if (zfs_acl_ids_overquota(zfsvfs, &acl_ids)) { + zfs_acl_ids_free(&acl_ids); error = EDQUOT; goto out; } *************** *** 2208,2213 **** return (error); } if (zfs_acl_ids_overquota(zfsvfs, &acl_ids)) { zfs_dirent_unlock(dl); ZFS_EXIT(zfsvfs); return (EDQUOT); --- 2243,2249 ---- return (error); } if (zfs_acl_ids_overquota(zfsvfs, &acl_ids)) { + zfs_acl_ids_free(&acl_ids); zfs_dirent_unlock(dl); ZFS_EXIT(zfsvfs); return (EDQUOT); *************** *** 3373,3382 **** if (attrzp) VN_RELE(ZTOV(attrzp)); - if (aclp) { zfs_acl_free(aclp); - aclp = NULL; - } if (fuidp) { zfs_fuid_info_free(fuidp); --- 3412,3419 ---- if (attrzp) VN_RELE(ZTOV(attrzp)); + if (aclp) zfs_acl_free(aclp); if (fuidp) { zfs_fuid_info_free(fuidp); FNFS# -- Sam Fourman Jr. Fourman Networks http://www.fourmannetworks.com