ubifs: Fix ubifs_tnc_lookup() usage in do_kill_orphans()

Orphans are allowed to point to deleted inodes. So -ENOENT is not a fatal error. Reported-by: Кочетков Максим <[email protected]> Reported-and-tested-by: "Christian Berger" <[email protected]> Tested-by: Karl Olsen <[email protected]> Tested-by: Jef Driesen <[email protected]> Fixes: ee1438c ("ubifs: Check link count of inodes when killing orphans.") Signed-off-by: Richard Weinberger <[email protected]>
marcan · Mar 30, 2020 · 4ab25ac · 4ab25ac
1 parent 16fbf79
commit 4ab25ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
@@ -688,14 +688,14 @@ static int do_kill_orphans(struct ubifs_info *c, struct ubifs_scan_leb *sleb,
 
 			ino_key_init(c, &key1, inum);
 			err = ubifs_tnc_lookup(c, &key1, ino);
-			if (err)
+			if (err && err != -ENOENT)
 				goto out_free;
 
 			/*
 			 * Check whether an inode can really get deleted.
 			 * linkat() with O_TMPFILE allows rebirth of an inode.
 			 */
-			if (ino->nlink == 0) {
+			if (err == 0 && ino->nlink == 0) {
 				dbg_rcvry("deleting orphaned inode %lu",
 					  (unsigned long)inum);