PERFORCE change 15699 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15699

Change 15699 by rwatson at rwatson_paprika on 2002/08/08 14:34:27

	Various fixes for compilation relating to recent vn_rdwr()
	and fo_ioctl() argument changes for modules not compiled by
	default.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#4 edit
.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#6 edit
.. //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/dev/drm/drm_drv.h#4 (text+ko) ====

@@ -1440,7 +1440,7 @@
      * Pass the ioctl off to our standard handler.
      */
 #if (__FreeBSD_version >= 500000)
-    return(fo_ioctl(fp, cmd, data, p->td_ucred));
+    return(fo_ioctl(fp, cmd, data, p->td_ucred, p));
 #else
     return(fo_ioctl(fp, cmd, data, p));
 #endif

==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_lookup.c#6 (text+ko) ====

@@ -1011,7 +1011,7 @@
 	for (off = 0; off < ip->i_size; off += dp->rec_len) {
 		error = vn_rdwr(UIO_READ, ITOV(ip), (caddr_t)dp, MINDIRSIZ,
 		    off, UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK, cred,
-		    &count, (struct thread *)0);
+		    NOCRED, &count, (struct thread *)0);
 		/*
 		 * Since we read MINDIRSIZ, residual must
 		 * be 0 unless we're at end of file.
@@ -1075,7 +1075,7 @@
 		}
 		error = vn_rdwr(UIO_READ, vp, (caddr_t)&dirbuf,
 			sizeof (struct dirtemplate), (off_t)0, UIO_SYSSPACE,
-			IO_NODELOCKED | IO_NOMACCHEK, cred, (int *)0,
+			IO_NODELOCKED | IO_NOMACCHECK, cred, NOCRED, (int *)0,
 			(struct thread *)0);
 		if (error != 0)
 			break;

==== //depot/projects/trustedbsd/mac/sys/gnu/ext2fs/ext2_vnops.c#6 (text+ko) ====

@@ -1221,7 +1221,8 @@
 			error = vn_rdwr(UIO_READ, fvp, (caddr_t)&dirbuf,
 				sizeof (struct dirtemplate), (off_t)0,
 				UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK,
-				tcnp->cn_cred, (int *)0, (struct thread *)0);
+				tcnp->cn_cred, NOCRED, (int *)0,
+				(struct thread *)0);
 			if (error == 0) {
 				/* Like ufs little-endian: */
 				namlen = dirbuf.dotdot_type;
@@ -1238,7 +1239,8 @@
 					    (off_t)0, UIO_SYSSPACE,
 					    IO_NODELOCKED | IO_SYNC |
 					    IO_NOMACCHECK, tcnp->cn_cred,
-					    (int *)0, (struct thread *)0);
+					    NOCRED, (int *)0,
+					    (struct thread *)0);
 					cache_purge(fdvp);
 				}
 			}
@@ -1373,8 +1375,8 @@
 	dirtemplate.dotdot_reclen = DIRBLKSIZ - 12;
 	error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate,
 	    sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE,
-	    IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, cnp->cn_cred, (int *)0,
-	    (struct thread *)0);
+	    IO_NODELOCKED | IO_SYNC | IO_NOMACCHECK, cnp->cn_cred, NOCRED,
+	    (int *)0, (struct thread *)0);
 	if (error) {
 		dp->i_nlink--;
 		dp->i_flag |= IN_CHANGE;
@@ -1510,8 +1512,9 @@
 		ip->i_flag |= IN_CHANGE | IN_UPDATE;
 	} else
 		error = vn_rdwr(UIO_WRITE, vp, ap->a_target, len, (off_t)0,
-		    UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACHCHECK,
-		    ap->a_cnp->cn_cred, (int *)0, (struct thread *)0);
+		    UIO_SYSSPACE, IO_NODELOCKED | IO_NOMACCHECK,
+		    ap->a_cnp->cn_cred, NOCRED, (int *)0,
+		    (struct thread *)0);
 	if (error)
 		vput(vp);
 	return (error);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message