From 525a965d9e5c578967ccdcdd22fdd0903bc56589 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 2 May 1996 03:22:57 +0000 Subject: Fix up recovery logic for when reconnecting an inode fails. Get rid of extraneous calls to pfail. --- ufs-fsck/pass4.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'ufs-fsck/pass4.c') diff --git a/ufs-fsck/pass4.c b/ufs-fsck/pass4.c index 3f5c26cc..17c0b307 100644 --- a/ufs-fsck/pass4.c +++ b/ufs-fsck/pass4.c @@ -44,8 +44,6 @@ pass4() write_inode (number, &dino); pfix ("ADJUSTED"); } - else - pfail (0); } } else if (linkfound[number] && inodestate[number] == UNALLOC) @@ -73,21 +71,21 @@ pass4() if (preen || reply ("RECONNECT")) reconn_failed = !linkup (number, -1); - if (!reconn_failed) + if (! reconn_failed) pfix ("RECONNECTED"); - else - pfail ("FAILED"); } if (dino.di_size == 0 || reconn_failed) { + if (reconn_failed && !preen) + /* If preening, the previous call to problem is still active + (more likely the failure was too severe, and exited). */ + problem (0, "RECONNECT FAILED"); if (preen || reply ("CLEAR")) { inodestate[number] = UNALLOC; clear_inode (number, &dino); pfix ("CLEARED"); } - else - pfail (0); } } } -- cgit v1.2.3