From owner-p4-projects@FreeBSD.ORG  Tue Jan 13 17:15:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A6D3F1065675; Tue, 13 Jan 2009 17:15:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64B64106564A
	for <perforce@freebsd.org>; Tue, 13 Jan 2009 17:15:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CB698FC08
	for <perforce@freebsd.org>; Tue, 13 Jan 2009 17:15:48 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0DHFlo0058983
	for <perforce@freebsd.org>; Tue, 13 Jan 2009 17:15:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0DHFloj058981
	for perforce@freebsd.org; Tue, 13 Jan 2009 17:15:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 13 Jan 2009 17:15:47 GMT
Message-Id: <200901131715.n0DHFloj058981@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 156096 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2009 17:15:50 -0000

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

Change 156096 by rwatson@rwatson_freebsd_capabilities on 2009/01/13 17:15:39

	OpenSolaris compat code now hides fget_{read,write}() behind
	getf(), so update it to capability support.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/compat/opensolaris/sys/file.h#2 (text+ko) ====

@@ -39,9 +39,11 @@
 {
 	struct file *fp;
 
-	if (write && fget_write(curthread, fd, &fp) == 0)
+	if (write && fget_write(curthread, fd, CAP_WRITE | CAP_SEEK, &fp) ==
+	    0)
 		return (fp);
-	else if (!write && fget_read(curthread, fd, &fp) == 0)
+	else if (!write && fget_read(curthread, CAP_READ | CAP_SEEK,  fd,
+	    &fp) == 0)
 		return (fp);
 	return (NULL);
 }

==== //depot/projects/trustedbsd/capabilities/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 (text+ko) ====

@@ -2466,10 +2466,6 @@
 	    &props)) != 0)
 		return (error);
 
-#if 0
-	/* XXXRW: Is this the right capability? */
-	error = fget_read(td, zc->zc_cookie, CAP_READ | CAP_SEEK, &fp);
-#endif
 	fd = zc->zc_cookie;
 	fp = getf(fd, 0);
 	if (fp == NULL) {
@@ -2619,12 +2615,6 @@
 
 	fp = getf(zc->zc_cookie, 1);
 	if (fp == NULL) {
-#if 0
-	fd = zc->zc_cookie;
-	/* XXXRW: Is this the right capability? */
-	error = fget_write(td, fd, CAP_WRITE | CAP_SEEK, &fp);
-	if (error) {
-#endif
 		dmu_objset_close(tosnap);
 		if (fromsnap)
 			dmu_objset_close(fromsnap);