d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some style fixes.

Browse Source 
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Konstantin Belousov 2013-03-14 20:31:39 +00:00
parent c535690b33
commit 70e198dd07
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/vfs_bio.c
View File

@ -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 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo,
}
/*
* 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)) {

2
sys/kern/vfs_cluster.c
View File

@ -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;

8
sys/ufs/ffs/ffs_balloc.c
View File

@ -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);

2
sys/vm/vnode_pager.c
View File

@ -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