diff options
| author | kib <kib@FreeBSD.org> | 2013-03-14 20:31:39 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-03-14 20:31:39 +0000 |
| commit | 7ca94eca24d0f2013eefeb498c3ae0489022ee3a (patch) | |
| tree | b533ae31461d7fb48a967c4d737c37b8f08b1134 | |
| parent | 9b0c4b125bb359cc94686ed5aafa1aaeecbcc3cf (diff) | |
| download | FreeBSD-src-7ca94eca24d0f2013eefeb498c3ae0489022ee3a.zip FreeBSD-src-7ca94eca24d0f2013eefeb498c3ae0489022ee3a.tar.gz | |
Some style fixes.
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | sys/kern/vfs_bio.c | 12 | ||||
| -rw-r--r-- | sys/kern/vfs_cluster.c | 2 | ||||
| -rw-r--r-- | sys/ufs/ffs/ffs_balloc.c | 8 | ||||
| -rw-r--r-- | sys/vm/vnode_pager.c | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 4ac9996..d20c829 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -830,9 +830,8 @@ breada(struct vnode * vp, daddr_t * rablkno, int * rabsize, * 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; @@ -1809,7 +1808,7 @@ vfs_bio_awrite(struct buf *bp) nwritten = bp->b_bufsize; (void) bwrite(bp); - return nwritten; + return (nwritten); } /* @@ -2631,7 +2630,7 @@ vfs_setdirty_locked_object(struct buf *bp) * 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; @@ -2709,9 +2708,8 @@ loop: } /* - * 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)) { diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index e0397d7..28aa4ff 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -563,7 +563,7 @@ cluster_wbuild_wb(struct vnode *vp, long size, daddr_t start_lbn, int len) { int r = 0; - switch(write_behind) { + switch (write_behind) { case 2: if (start_lbn < len) break; diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index 8ac9d80..a5e99d9 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -679,9 +679,9 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, 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)) @@ -733,7 +733,7 @@ ffs_balloc_ufs2(struct vnode *vp, off_t startoffset, int size, 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); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 5e331ee..a0340af 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -900,7 +900,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage) } 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 |
