ubifs: Fix ubifs_tnc_lookup() usage in do_kill_orphans()

commit 4ab25ac8b2b5514151d5f91cf9514df08dd26938 upstream.

Orphans are allowed to point to deleted inodes.
So -ENOENT is not a fatal error.

Reported-by: Кочетков Максим <fido_max@inbox.ru>
Reported-and-tested-by: "Christian Berger" <Christian.Berger@de.bosch.com>
Tested-by: Karl Olsen <karl@micro-technic.com>
Tested-by: Jef Driesen <jef.driesen@niko.eu>
Fixes: ee1438ce5dc4 ("ubifs: Check link count of inodes when killing orphans.")
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: Christian Eggers <ceggers@arri.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ubifs/orphan.c b/fs/ubifs/orphan.c
index edf43dd..7dd740e 100644 (file)
--- 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);