hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better bounding on softdep_flushfiles; other minor tweeks to checks.

Browse Source
This commit is contained in:
Kirk McKusick 2000-01-17 06:35:11 +00:00
parent 107d5039ef
commit 105ef72c55
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=56150
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/contrib/softupdates/ffs_softdep.c
View File

@ -52,7 +52,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)ffs_softdep.c 9.53 (McKusick) 1/16/00
* from: @(#)ffs_softdep.c 9.54 (McKusick) 1/16/00
* $FreeBSD$
*/
@ -680,8 +680,9 @@ softdep_flushfiles(oldmnt, flags, p)
* but we give it a few extra just to be sure.
*/
devvp = VFSTOUFS(oldmnt)->um_devvp;
for (loopcnt = 10; loopcnt > 0; loopcnt--) {
for (loopcnt = 10; loopcnt > 0; ) {
if (softdep_process_worklist(oldmnt) == 0) {
loopcnt--;
/*
* Do another flush in case any vnodes were brought in
* as part of the cleanup operations.
@ -1771,7 +1772,9 @@ deallocate_dependencies(bp, inodedep)
dirrem = LIST_NEXT(dirrem, dm_next)) {
LIST_REMOVE(dirrem, dm_next);
dirrem->dm_dirinum = pagedep->pd_ino;
if (inodedep == NULL)
if (inodedep == NULL ||
(inodedep->id_state & ALLCOMPLETE) ==
ALLCOMPLETE)
add_to_worklist(&dirrem->dm_list);
else
WORKLIST_INSERT(&inodedep->id_bufwait,
@ -3589,10 +3592,9 @@ softdep_update_inodeblock(ip, bp, waitfor)
* to track.
*/
ACQUIRE_LOCK(&lk);
if (ip->i_effnlink != ip->i_nlink) {
(void) inodedep_lookup(ip->i_fs, ip->i_number, DEPALLOC,
&inodedep);
} else if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
if (ip->i_effnlink != ip->i_nlink)
panic("softdep_update_inodeblock: bad link count");
FREE_LOCK(&lk);
return;
}

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

@ -52,7 +52,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* from: @(#)ffs_softdep.c 9.53 (McKusick) 1/16/00
* from: @(#)ffs_softdep.c 9.54 (McKusick) 1/16/00
* $FreeBSD$
*/
@ -680,8 +680,9 @@ softdep_flushfiles(oldmnt, flags, p)
* but we give it a few extra just to be sure.
*/
devvp = VFSTOUFS(oldmnt)->um_devvp;
for (loopcnt = 10; loopcnt > 0; loopcnt--) {
for (loopcnt = 10; loopcnt > 0; ) {
if (softdep_process_worklist(oldmnt) == 0) {
loopcnt--;
/*
* Do another flush in case any vnodes were brought in
* as part of the cleanup operations.
@ -1771,7 +1772,9 @@ deallocate_dependencies(bp, inodedep)
dirrem = LIST_NEXT(dirrem, dm_next)) {
LIST_REMOVE(dirrem, dm_next);
dirrem->dm_dirinum = pagedep->pd_ino;
if (inodedep == NULL)
if (inodedep == NULL ||
(inodedep->id_state & ALLCOMPLETE) ==
ALLCOMPLETE)
add_to_worklist(&dirrem->dm_list);
else
WORKLIST_INSERT(&inodedep->id_bufwait,
@ -3589,10 +3592,9 @@ softdep_update_inodeblock(ip, bp, waitfor)
* to track.
*/
ACQUIRE_LOCK(&lk);
if (ip->i_effnlink != ip->i_nlink) {
(void) inodedep_lookup(ip->i_fs, ip->i_number, DEPALLOC,
&inodedep);
} else if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
if (inodedep_lookup(ip->i_fs, ip->i_number, 0, &inodedep) == 0) {
if (ip->i_effnlink != ip->i_nlink)
panic("softdep_update_inodeblock: bad link count");
FREE_LOCK(&lk);
return;
}