PERFORCE change 168304 for review

[Edward Tomasz Napierala]

http://perforce.freebsd.org/chv.cgi?CH=168304

Change 168304 by trasz at trasz_anger on 2009/09/07 21:18:14

	IFC.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/proc.h#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#32 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/Makefile#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/fstest.c#8 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chmod/12.t#2 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#6 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#5 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#4 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#5 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 (text+ko) ====

@@ -172,6 +172,7 @@
 
 		*tab = '\0';
 		if (strcmp(buf, mountpoint) == 0) {
+#if defined(sun)
 			/*
 			 * the protocol field is the third field
 			 * skip over second field
@@ -194,6 +195,10 @@
 					return (0);
 				}
 			}
+#else
+			if (proto == PROTO_NFS)
+				return (SHARED_NFS);
+#endif
 		}
 	}
 

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/proc.h#4 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/proc.h,v 1.8 2009/08/23 11:33:46 pjd Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/proc.h,v 1.9 2009/09/07 19:22:44 pjd Exp $
  */
 
 #ifndef _OPENSOLARIS_SYS_PROC_H_
@@ -37,6 +37,7 @@
 #include <sys/sched.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/unistd.h>
 #include <sys/debug.h>
 
 #ifdef _KERNEL
@@ -74,11 +75,12 @@
 	ASSERT(state == TS_RUN);
 	ASSERT(pp == &p0);
 
-	error = kproc_kthread_add(proc, arg, &zfsproc, &td, 0,
+	error = kproc_kthread_add(proc, arg, &zfsproc, &td, RFSTOPPED,
 	    stksize / PAGE_SIZE, "zfskern", "solthread %p", proc);
 	if (error == 0) {
 		thread_lock(td);
 		sched_prio(td, pri);
+		sched_add(td, SRQ_BORING);
 		thread_unlock(td);
 	}
 	return (td);

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#32 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/tools/regression/fstest/Makefile,v 1.2 2008/11/23 19:56:09 pjd Exp $
+# $FreeBSD: src/tools/regression/fstest/Makefile,v 1.3 2009/09/07 19:40:22 trasz Exp $
 
 OSTYPE=$(shell uname)
 

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/fstest.c#8 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/tools/regression/fstest/fstest.c,v 1.5 2009/06/03 09:24:58 pjd Exp $
+ * $FreeBSD: src/tools/regression/fstest/fstest.c,v 1.6 2009/09/07 19:40:22 trasz Exp $
  */
 
 #include <sys/param.h>

==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chmod/12.t#2 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/00.t#4 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/01.t#3 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/02.t#6 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/03.t#5 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#4 (text+ko) ====


==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/05.t#5 (text+ko) ====