From owner-svn-src-head@FreeBSD.ORG Wed Aug 28 07:46:57 2013 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 34409B8D; Wed, 28 Aug 2013 07:46:57 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id D55FA227C; Wed, 28 Aug 2013 07:46:55 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id KAA04375; Wed, 28 Aug 2013 10:46:54 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1VEaSr-000O4c-PX; Wed, 28 Aug 2013 10:46:53 +0300 Message-ID: <521DAAB6.4010008@FreeBSD.org> Date: Wed, 28 Aug 2013 10:45:58 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130810 Thunderbird/17.0.8 MIME-Version: 1.0 To: Xin LI Subject: Re: svn commit: r254982 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201308280039.r7S0dmRK082241@svn.freebsd.org> In-Reply-To: <201308280039.r7S0dmRK082241@svn.freebsd.org> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Aug 2013 07:46:57 -0000 on 28/08/2013 03:39 Xin LI said the following: > @@ -6250,8 +6250,11 @@ zfs_freebsd_rename(ap) > ASSERT(ap->a_fcnp->cn_flags & (SAVENAME|SAVESTART)); > ASSERT(ap->a_tcnp->cn_flags & (SAVENAME|SAVESTART)); > > - error = zfs_rename(fdvp, ap->a_fcnp->cn_nameptr, tdvp, > - ap->a_tcnp->cn_nameptr, ap->a_fcnp->cn_cred, NULL, 0); > + if (fdvp->v_mount == tdvp->v_mount) > + error = zfs_rename(fdvp, ap->a_fcnp->cn_nameptr, tdvp, > + ap->a_tcnp->cn_nameptr, ap->a_fcnp->cn_cred, NULL, 0); > + else > + error = EXDEV; > > if (tdvp == tvp) > VN_RELE(tdvp); So, I am still not sure if that is important or not, but this change still misses (tvp && (fvp->v_mount != tvp->v_mount)) check as found in ufs_rename. -- Andriy Gapon