svn commit: r184740 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Edward Tomasz Napierala]

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.