svn commit: r203284 - projects/capabilities8/sys/fs/fdescfs

[Robert Watson]

Author: rwatson
Date: Sun Jan 31 13:01:02 2010
New Revision: 203284
URL: http://svn.freebsd.org/changeset/base/203284

Log:
  Merge c174017 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Disable fdesc_setattr, not fdesc_getattr.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c

Modified: projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c	Sun Jan 31 12:32:57 2010	(r203283)
+++ projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c	Sun Jan 31 13:01:02 2010	(r203284)
@@ -392,7 +392,6 @@ fdesc_getattr(ap)
 	} */ *ap;
 {
 
-#if 0
 	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
 
@@ -432,9 +431,6 @@ fdesc_getattr(ap)
 
 	vp->v_type = vap->va_type;
 	return (0);
-#else
-	return (EOPNOTSUPP);
-#endif
 }
 
 static int
@@ -445,6 +441,7 @@ fdesc_setattr(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
+#if 0
 	struct vattr *vap = ap->a_vap;
 	struct vnode *vp;
 	struct mount *mp;
@@ -488,6 +485,9 @@ fdesc_setattr(ap)
 	}
 	fdrop(fp, td);
 	return (error);
+#else
+	return (EOPNOTSUPP);
+#endif
 }
 
 #define UIO_MX 16