Page MenuHomeFreeBSD
Files F150110100

D20066.diff
No OneTemporary
Actions

D20066.diff
View Options

Index: head/sys/kern/vfs_bio.c
===================================================================
--- head/sys/kern/vfs_bio.c
+++ head/sys/kern/vfs_bio.c
@@ -2073,8 +2073,11 @@
struct ucred * cred, int flags, void (*ckhashfunc)(struct buf *))
{
struct buf *rabp;
+ struct thread *td;
int i;
+ td = curthread;
+
for (i = 0; i < cnt; i++, rablkno++, rabsize++) {
if (inmem(vp, *rablkno))
continue;
@@ -2083,16 +2086,14 @@
brelse(rabp);
continue;
}
- if (!TD_IS_IDLETHREAD(curthread)) {
#ifdef RACCT
- if (racct_enable) {
- PROC_LOCK(curproc);
- racct_add_buf(curproc, rabp, 0);
- PROC_UNLOCK(curproc);
- }
-#endif /* RACCT */
- curthread->td_ru.ru_inblock++;
+ if (racct_enable) {
+ PROC_LOCK(curproc);
+ racct_add_buf(curproc, rabp, 0);
+ PROC_UNLOCK(curproc);
}
+#endif /* RACCT */
+ td->td_ru.ru_inblock++;
rabp->b_flags |= B_ASYNC;
rabp->b_flags &= ~B_INVAL;
if ((flags & GB_CKHASH) != 0) {
@@ -2148,16 +2149,14 @@
*/
readwait = 0;
if ((bp->b_flags & B_CACHE) == 0) {
- if (!TD_IS_IDLETHREAD(td)) {
#ifdef RACCT
- if (racct_enable) {
- PROC_LOCK(td->td_proc);
- racct_add_buf(td->td_proc, bp, 0);
- PROC_UNLOCK(td->td_proc);
- }
-#endif /* RACCT */
- td->td_ru.ru_inblock++;
+ if (racct_enable) {
+ PROC_LOCK(td->td_proc);
+ racct_add_buf(td->td_proc, bp, 0);
+ PROC_UNLOCK(td->td_proc);
}
+#endif /* RACCT */
+ td->td_ru.ru_inblock++;
bp->b_iocmd = BIO_READ;
bp->b_flags &= ~B_INVAL;
if ((flags & GB_CKHASH) != 0) {
@@ -2258,16 +2257,14 @@
bp->b_runningbufspace = bp->b_bufsize;
space = atomic_fetchadd_long(&runningbufspace, bp->b_runningbufspace);
- if (!TD_IS_IDLETHREAD(curthread)) {
#ifdef RACCT
- if (racct_enable) {
- PROC_LOCK(curproc);
- racct_add_buf(curproc, bp, 1);
- PROC_UNLOCK(curproc);
- }
-#endif /* RACCT */
- curthread->td_ru.ru_oublock++;
+ if (racct_enable) {
+ PROC_LOCK(curproc);
+ racct_add_buf(curproc, bp, 1);
+ PROC_UNLOCK(curproc);
}
+#endif /* RACCT */
+ curthread->td_ru.ru_oublock++;
if (oldflags & B_ASYNC)
BUF_KERNPROC(bp);
bp->b_iooffset = dbtob(bp->b_blkno);
@@ -4019,9 +4016,6 @@
*/
if (flags & GB_NOCREAT)
return (EEXIST);
- if (bdomain[bo->bo_domain].bd_freebuffers == 0 &&
- TD_IS_IDLETHREAD(curthread))
- return (EBUSY);
bsize = vn_isdisk(vp, NULL) ? DEV_BSIZE : bo->bo_bsize;
KASSERT(bsize != 0, ("bsize == 0, check bo->bo_bsize"));

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 11:16 AM (4 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30585275
Default Alt Text
D20066.diff (2 KB)

Event Timeline