system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-04 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug I introduced in 1.561 which has caused considerable filesystem

Browse source 
unhappiness lately.

As far as I can tell, no files that have made it safely to disk
have been endangered, but stuff in transit has been in peril.

Pointy hat:	phk
This commit is contained in:
Poul-Henning Kamp 2005-01-16 21:09:39 +00:00
parent 626cba20c7
commit 7bf38aeae7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=140360
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/kern/vfs_subr.c
View file

@ -956,7 +956,7 @@ vinvalbuf(vp, flags, td, slpflag, slptimeo)
if (error == 0)
error = flushbuflist(&bo->bo_dirty,
flags, vp, slpflag, slptimeo);
if (error != EAGAIN) {
if (error != 0 && error != EAGAIN) {
BO_UNLOCK(bo);
return (error);
}
@ -1011,19 +1011,19 @@ flushbuflist(bufv, flags, vp, slpflag, slptimeo)
int slpflag, slptimeo;
{
struct buf *bp, *nbp;
int found, error;
int retval, error;
struct bufobj *bo;
bo = &vp->v_bufobj;
ASSERT_BO_LOCKED(bo);
found = 0;
retval = 0;
TAILQ_FOREACH_SAFE(bp, &bufv->bv_hd, b_bobufs, nbp) {
if (((flags & V_NORMAL) && (bp->b_xflags & BX_ALTDATA)) ||
((flags & V_ALT) && (bp->b_xflags & BX_ALTDATA) == 0)) {
continue;
}
found += 1;
retval = EAGAIN;
error = BUF_TIMELOCK(bp,
LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, BO_MTX(bo),
"flushbuf", slpflag, slptimeo);
@ -1063,7 +1063,7 @@ flushbuflist(bufv, flags, vp, slpflag, slptimeo)
brelse(bp);
BO_LOCK(bo);
}
return (found ? EAGAIN : 0);
return (retval);
}
/*