From owner-svn-src-head@FreeBSD.ORG  Thu Nov  6 22:28:04 2008
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 56A041065672;
	Thu,  6 Nov 2008 22:28:04 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44C338FC08;
	Thu,  6 Nov 2008 22:28:04 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA6MS40l067375;
	Thu, 6 Nov 2008 22:28:04 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA6MS45S067374;
	Thu, 6 Nov 2008 22:28:04 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <200811062228.mA6MS45S067374@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 6 Nov 2008 22:28:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184740 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 06 Nov 2008 22:28:04 -0000

Author: trasz
Date: Thu Nov  6 22:28:04 2008
New Revision: 184740
URL: http://svn.freebsd.org/changeset/base/184740

Log:
  Backoff the last patch.  It was overly restrictive - we want to check
  for write permission on target only when moving the target between two
  directories.
  
  Approved by:	rwatson (mentor)

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Thu Nov  6 22:11:57 2008	(r184739)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c	Thu Nov  6 22:28:04 2008	(r184740)
@@ -1580,14 +1580,7 @@ zfs_zaccess_rename(znode_t *sdzp, znode_
 	/*
 	 * Rename permissions are combination of delete permission +
 	 * add file/subdir permission.
-	 *
-	 * BSD operating systems also require write permission
-	 * on the directory being moved.
 	 */
-	if (ZTOV(szp)->v_type == VDIR) {
-		if (error = zfs_zaccess(szp, ACE_WRITE_DATA, cr))
-			return (error);
-	}
 
 	/*
 	 * first make sure we do the delete portion.