From: Richard Weinberger <[email protected]>

commit 4ab25ac8b2b5514151d5f91cf9514df08dd26938 upstream.

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: ee1438ce5dc4 ("ubifs: Check link count of inodes when killing orphans.")
Signed-off-by: Richard Weinberger <[email protected]>
Cc: Christian Eggers <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 fs/ubifs/orphan.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/fs/ubifs/orphan.c
+++ b/fs/ubifs/orphan.c
@@ -688,14 +688,14 @@ static int do_kill_orphans(struct ubifs_
 
                        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);
 


Reply via email to