PERFORCE change 91217 for review

Robert Watson rwatson at FreeBSD.org
Mon Feb 6 02:14:20 GMT 2006


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

Change 91217 by rwatson at rwatson_peppercorn on 2006/02/06 02:13:42

	Reduce some minor white space differences from the vendor.
	
	Remove one comment that probably is OK not to have.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#22 (text+ko) ====

@@ -328,7 +328,6 @@
 	error = getvnode(td->td_proc->p_fd, fd, &fp);
 	if (error)
 		return (error);
-
 	mp = fp->f_vnode->v_mount;
 	fdrop(fp, td);
 	if (mp == NULL)
@@ -1142,7 +1141,7 @@
 		int mode;
 	} */ *uap;
 {
-	/* Auditing is done in kern_open() */
+
 	return (kern_open(td, uap->path, UIO_USERSPACE,
 	    O_WRONLY | O_CREAT | O_TRUNC, uap->mode));
 }
@@ -2465,7 +2464,6 @@
 	if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
-
 	error = setfflags(td, fp->f_vnode, uap->flags);
 	VFS_UNLOCK_GIANT(vfslocked);
 	fdrop(fp, td);
@@ -2602,9 +2600,7 @@
 	if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
-
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
-
 	error = setfmode(td, fp->f_vnode, uap->mode);
 	VFS_UNLOCK_GIANT(vfslocked);
 	fdrop(fp, td);
@@ -2760,7 +2756,6 @@
 	if ((error = getvnode(td->td_proc->p_fd, uap->fd, &fp)) != 0)
 		return (error);
 	vfslocked = VFS_LOCK_GIANT(fp->f_vnode->v_mount);
-
 	error = setfown(td, fp->f_vnode, uap->uid, uap->gid);
 	VFS_UNLOCK_GIANT(vfslocked);
 	fdrop(fp, td);
@@ -3379,7 +3374,6 @@
 	int vfslocked;
 
 	AUDIT_ARG(mode, mode);
-
 restart:
 	bwillwrite();
 	NDINIT(&nd, CREATE, LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1,
@@ -3734,7 +3728,6 @@
 	/* vn_lock(vp, LK_SHARED | LK_RETRY, td); */
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 	AUDIT_ARG(vnode, fp->f_vnode, ARG_VNODE1);
-
 	loff = auio.uio_offset = fp->f_offset;
 #ifdef MAC
 	error = mac_check_vnode_readdir(td->td_ucred, vp);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message



More information about the trustedbsd-cvs mailing list