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

[Martin Matuska]

Author: mm
Date: Fri Oct  8 23:01:38 2010
New Revision: 213634
URL: http://svn.freebsd.org/changeset/base/213634

Log:
  Change FAPPEND to IO_APPEND as this is a ioflag and not a fflag.
  This corrects writing to append-only files on ZFS.
  
  PR:		kern/149495 [1], kern/151082 [2]
  Submitted by:	Daniel Zhelev <daniel at zhelev.biz> [1], Michael Naef <cal at linu.gs> [2]
  Approved by:	delphij (mentor)
  MFC after:	1 week

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

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Oct  8 21:54:33 2010	(r213633)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Fri Oct  8 23:01:38 2010	(r213634)
@@ -755,7 +755,7 @@ zfs_write(vnode_t *vp, uio_t *uio, int i
 	 */
 	pflags = zp->z_phys->zp_flags;
 	if ((pflags & (ZFS_IMMUTABLE | ZFS_READONLY)) ||
-	    ((pflags & ZFS_APPENDONLY) && !(ioflag & FAPPEND) &&
+	    ((pflags & ZFS_APPENDONLY) && !(ioflag & IO_APPEND) &&
 	    (uio->uio_loffset < zp->z_phys->zp_size))) {
 		ZFS_EXIT(zfsvfs);
 		return (EPERM);