svn commit: r250947 - in stable/9/sys: kern ufs/ffs vm

[Scott Long]

Author: scottl
Date: Thu May 23 22:45:58 2013
New Revision: 250947
URL: http://svnweb.freebsd.org/changeset/base/250947

Log:
  MFC r248283:
  
  Some style fixes
  
  Submitted by:	kib
  Obtained from:	Netflix

Modified:
  stable/9/sys/kern/vfs_bio.c
  stable/9/sys/kern/vfs_cluster.c
  stable/9/sys/ufs/ffs/ffs_balloc.c
  stable/9/sys/vm/vnode_pager.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_bio.c
==============================================================================
--- stable/9/sys/kern/vfs_bio.c	Thu May 23 22:11:57 2013	(r250946)
+++ stable/9/sys/kern/vfs_bio.c	Thu May 23 22:45:58 2013	(r250947)
@@ -855,9 +855,8 @@ breadn(struct vnode * vp, daddr_t blkno,
  * getblk(). Also starts asynchronous I/O on read-ahead blocks.
  */
 int
-breadn_flags(struct vnode * vp, daddr_t blkno, int size,
-    daddr_t * rablkno, int *rabsize, int cnt,
-    struct ucred * cred, int flags, struct buf **bpp)
+breadn_flags(struct vnode *vp, daddr_t blkno, int size, daddr_t *rablkno,
+    int *rabsize, int cnt, struct ucred *cred, int flags, struct buf **bpp)
 {
 	struct buf *bp;
 	int rv = 0, readwait = 0;
@@ -1844,7 +1843,7 @@ vfs_bio_awrite(struct buf *bp)
 	nwritten = bp->b_bufsize;
 	(void) bwrite(bp);
 
-	return nwritten;
+	return (nwritten);
 }
 
 /*
@@ -2678,7 +2677,7 @@ vfs_setdirty_locked_object(struct buf *b
  *	prior to issuing the READ.  biodone() will *not* clear B_INVAL.
  */
 struct buf *
-getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo,
+getblk(struct vnode *vp, daddr_t blkno, int size, int slpflag, int slptimeo,
     int flags)
 {
 	struct buf *bp;
@@ -2752,9 +2751,8 @@ loop:
 		BO_UNLOCK(bo);
 
 		/*
-		 * check for size inconsistancies for non-VMIO case.
+		 * check for size inconsistencies for non-VMIO case.
 		 */
-
 		if (bp->b_bcount != size) {
 			if ((bp->b_flags & B_VMIO) == 0 ||
 			    (size > bp->b_kvasize)) {

Modified: stable/9/sys/kern/vfs_cluster.c
==============================================================================
--- stable/9/sys/kern/vfs_cluster.c	Thu May 23 22:11:57 2013	(r250946)
+++ stable/9/sys/kern/vfs_cluster.c	Thu May 23 22:45:58 2013	(r250947)
@@ -581,7 +581,7 @@ cluster_wbuild_wb(struct vnode *vp, long
 {
 	int r = 0;
 
-	switch(write_behind) {
+	switch (write_behind) {
 	case 2:
 		if (start_lbn < len)
 			break;

Modified: stable/9/sys/ufs/ffs/ffs_balloc.c
==============================================================================
--- stable/9/sys/ufs/ffs/ffs_balloc.c	Thu May 23 22:11:57 2013	(r250946)
+++ stable/9/sys/ufs/ffs/ffs_balloc.c	Thu May 23 22:45:58 2013	(r250947)
@@ -681,9 +681,9 @@ ffs_balloc_ufs2(struct vnode *vp, off_t 
 		if (osize < fs->fs_bsize && osize > 0) {
 			UFS_LOCK(ump);
 			error = ffs_realloccg(ip, nb, dp->di_db[nb],
-				ffs_blkpref_ufs2(ip, lastlbn, (int)nb,
-				    &dp->di_db[0]), osize, (int)fs->fs_bsize,
-				    flags, cred, &bp);
+			    ffs_blkpref_ufs2(ip, lastlbn, (int)nb,
+			    &dp->di_db[0]), osize, (int)fs->fs_bsize,
+			    flags, cred, &bp);
 			if (error)
 				return (error);
 			if (DOINGSOFTDEP(vp))
@@ -735,7 +735,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t 
 				UFS_LOCK(ump);
 				error = ffs_realloccg(ip, lbn, dp->di_db[lbn],
 				    ffs_blkpref_ufs2(ip, lbn, (int)lbn,
-				       &dp->di_db[0]), osize, nsize, flags,
+				    &dp->di_db[0]), osize, nsize, flags,
 				    cred, &bp);
 				if (error)
 					return (error);

Modified: stable/9/sys/vm/vnode_pager.c
==============================================================================
--- stable/9/sys/vm/vnode_pager.c	Thu May 23 22:11:57 2013	(r250946)
+++ stable/9/sys/vm/vnode_pager.c	Thu May 23 22:45:58 2013	(r250947)
@@ -908,7 +908,7 @@ vnode_pager_generic_getpages(vp, m, byte
 	}
 
 	bp = getpbuf(&vnode_pbuf_freecnt);
-	kva = (vm_offset_t) bp->b_data;
+	kva = (vm_offset_t)bp->b_data;
 
 	/*
 	 * and map the pages to be read into the kva