mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Un-staticize waitrunningbufspace() and call it before returning from

Browse Source 
ffs_copyonwrite() if any async writes were launched.

Restore the threads previous TDP_NORUNNINGBUF state before returning
from ffs_copyonwrite().
This commit is contained in:
Don Lewis 2005-09-30 18:07:41 +00:00
parent 2e93e9099e
commit bd3c2d867d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=150760
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/kern/vfs_bio.c
View File

@ -373,7 +373,7 @@ bufcountwakeup(void)
* for earlier writes to complete and generally returns before the
* caller's write has reached the device.
*/
static __inline void
void
waitrunningbufspace(void)
{

1
sys/sys/buf.h
View File

@ -478,6 +478,7 @@ extern int cluster_pbuf_freecnt; /* Number of pbufs for clusters */
extern int vnode_pbuf_freecnt; /* Number of pbufs for vnode pager */
void runningbufwakeup(struct buf *);
void waitrunningbufspace(void);
caddr_t kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est);
void bufinit(void);
void bwillwrite(void);

14
sys/ufs/ffs/ffs_snapshot.c
View File

@ -1969,6 +1969,7 @@ ffs_copyonwrite(devvp, bp)
struct vnode *vp = 0;
ufs2_daddr_t lbn, blkno, *snapblklist;
int lower, upper, mid, indiroff, snapshot_locked = 0, error = 0;
int launched_async_io, prev_norunningbuf;
if (td->td_pflags & TDP_COWINPROGRESS)
panic("ffs_copyonwrite: recursive call");
@ -1997,6 +1998,8 @@ ffs_copyonwrite(devvp, bp)
VI_UNLOCK(devvp);
return (0);
}
launched_async_io = 0;
prev_norunningbuf = td->td_pflags & TDP_NORUNNINGBUF;
/*
* Since I/O on bp isn't yet in progress and it may be blocked
* for a long time waiting on snaplk, back it out of
@ -2101,6 +2104,8 @@ ffs_copyonwrite(devvp, bp)
bawrite(cbp);
if (dopersistence && ip->i_effnlink > 0)
(void) ffs_syncvnode(vp, MNT_WAIT);
else
launched_async_io = 1;
continue;
}
/*
@ -2111,6 +2116,8 @@ ffs_copyonwrite(devvp, bp)
bawrite(cbp);
if (dopersistence && ip->i_effnlink > 0)
(void) ffs_syncvnode(vp, MNT_WAIT);
else
launched_async_io = 1;
break;
}
savedcbp = cbp;
@ -2125,12 +2132,17 @@ ffs_copyonwrite(devvp, bp)
bawrite(savedcbp);
if (dopersistence && VTOI(vp)->i_effnlink > 0)
(void) ffs_syncvnode(vp, MNT_WAIT);
else
launched_async_io = 1;
}
if (snapshot_locked) {
lockmgr(vp->v_vnlock, LK_RELEASE, NULL, td);
td->td_pflags &= ~TDP_NORUNNINGBUF;
td->td_pflags = (td->td_pflags & ~TDP_NORUNNINGBUF) |
prev_norunningbuf;
} else
VI_UNLOCK(devvp);
if (launched_async_io && (td->td_pflags & TDP_NORUNNINGBUF))
waitrunningbufspace();
/*
* I/O on bp will now be started, so count it in runningbufspace.
*/