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

- Several of the callers to getdirtybuf() were erroneously changed to pass

Browse Source 
in a list head instead of a pointer to the first element at the time of
   the first call.  These lists are subject to change, and getdirtybuf()
   would refetch from the wrong list in some cases.

Spottedy by:	tegge
Pointy hat to:	me
This commit is contained in:
Jeff Roberson 2003-09-03 04:08:15 +00:00
parent 102d8cc6f2
commit cfd5600c66
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/ufs/ffs/ffs_softdep.c
View File

@ -4694,7 +4694,8 @@ softdep_update_inodeblock(ip, bp, waitfor)
FREE_LOCK(&lk); FREE_LOCK(&lk);
return; return;
} }
ibp = getdirtybuf(&inodedep->id_buf, NULL, MNT_WAIT); ibp = inodedep->id_buf;
ibp = getdirtybuf(&ibp, NULL, MNT_WAIT);
FREE_LOCK(&lk); FREE_LOCK(&lk);
if (ibp && (error = BUF_WRITE(ibp)) != 0) if (ibp && (error = BUF_WRITE(ibp)) != 0)
softdep_error("softdep_update_inodeblock: bwrite", error); softdep_error("softdep_update_inodeblock: bwrite", error);
@ -5015,7 +5016,8 @@ softdep_sync_metadata(ap)
adp = WK_ALLOCDIRECT(wk); adp = WK_ALLOCDIRECT(wk);
if (adp->ad_state & DEPCOMPLETE) if (adp->ad_state & DEPCOMPLETE)
continue; continue;
nbp = getdirtybuf(&adp->ad_buf, NULL, waitfor); nbp = adp->ad_buf;
nbp = getdirtybuf(&nbp, NULL, waitfor);
if (nbp == NULL) if (nbp == NULL)
continue; continue;
FREE_LOCK(&lk); FREE_LOCK(&lk);
@ -5031,7 +5033,8 @@ softdep_sync_metadata(ap)
aip = WK_ALLOCINDIR(wk); aip = WK_ALLOCINDIR(wk);
if (aip->ai_state & DEPCOMPLETE) if (aip->ai_state & DEPCOMPLETE)
continue; continue;
nbp = getdirtybuf(&aip->ai_buf, NULL, waitfor); nbp = aip->ai_buf;
nbp = getdirtybuf(&nbp, NULL, waitfor);
if (nbp == NULL) if (nbp == NULL)
continue; continue;
FREE_LOCK(&lk); FREE_LOCK(&lk);
@ -5049,7 +5052,8 @@ softdep_sync_metadata(ap)
LIST_FOREACH(aip, &WK_INDIRDEP(wk)->ir_deplisthd, ai_next) { LIST_FOREACH(aip, &WK_INDIRDEP(wk)->ir_deplisthd, ai_next) {
if (aip->ai_state & DEPCOMPLETE) if (aip->ai_state & DEPCOMPLETE)
continue; continue;
nbp = getdirtybuf(&aip->ai_buf, NULL, MNT_WAIT); nbp = aip->ai_buf;
nbp = getdirtybuf(&nbp, NULL, MNT_WAIT);
if (nbp == NULL) if (nbp == NULL)
goto restart; goto restart;
FREE_LOCK(&lk); FREE_LOCK(&lk);
@ -5098,7 +5102,8 @@ softdep_sync_metadata(ap)
* been sync'ed, this dependency can show up. So, * been sync'ed, this dependency can show up. So,
* rather than panic, just flush it. * rather than panic, just flush it.
*/ */
nbp = getdirtybuf(&WK_MKDIR(wk)->md_buf, NULL, waitfor); nbp = WK_MKDIR(wk)->md_buf;
nbp = getdirtybuf(&nbp, NULL, waitfor);
if (nbp == NULL) if (nbp == NULL)
continue; continue;
FREE_LOCK(&lk); FREE_LOCK(&lk);
@ -5118,8 +5123,8 @@ softdep_sync_metadata(ap)
* been sync'ed, this dependency can show up. So, * been sync'ed, this dependency can show up. So,
* rather than panic, just flush it. * rather than panic, just flush it.
*/ */
nbp = getdirtybuf(&WK_BMSAFEMAP(wk)->sm_buf, nbp = WK_BMSAFEMAP(wk)->sm_buf;
NULL, waitfor); nbp = getdirtybuf(&nbp, NULL, waitfor);
if (nbp == NULL) if (nbp == NULL)
continue; continue;
FREE_LOCK(&lk); FREE_LOCK(&lk);
@ -5268,7 +5273,8 @@ flush_deplist(listhead, waitfor, errorp)
TAILQ_FOREACH(adp, listhead, ad_next) { TAILQ_FOREACH(adp, listhead, ad_next) {
if (adp->ad_state & DEPCOMPLETE) if (adp->ad_state & DEPCOMPLETE)
continue; continue;
bp = getdirtybuf(&adp->ad_buf, NULL, waitfor); bp = adp->ad_buf;
bp = getdirtybuf(&bp, NULL, waitfor);
if (bp == NULL) { if (bp == NULL) {
if (waitfor == MNT_NOWAIT) if (waitfor == MNT_NOWAIT)
continue; continue;
@ -5383,7 +5389,8 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
* push them to disk. * push them to disk.
*/ */
if ((inodedep->id_state & DEPCOMPLETE) == 0) { if ((inodedep->id_state & DEPCOMPLETE) == 0) {
bp = getdirtybuf(&inodedep->id_buf, NULL, MNT_WAIT); bp = inodedep->id_buf;
bp = getdirtybuf(&bp, NULL, MNT_WAIT);
FREE_LOCK(&lk); FREE_LOCK(&lk);
if (bp && (error = BUF_WRITE(bp)) != 0) if (bp && (error = BUF_WRITE(bp)) != 0)
break; break;