These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / fs / ubifs / recovery.c

diff --git a/kernel/fs/ubifs/recovery.c b/kernel/fs/ubifs/recovery.c
index 695fc71..586d593 100644 (file)
--- a/kernel/fs/ubifs/recovery.c
+++ b/kernel/fs/ubifs/recovery.c
@@ -789,7 +789,7 @@ struct ubifs_scan_leb *ubifs_recover_leb(struct ubifs_info *c, int lnum,
 corrupted_rescan:
        /* Re-scan the corrupted data with verbose messages */
        ubifs_err(c, "corruption %d", ret);
-       ubifs_scan_a_node(c, buf, len, lnum, offs, 1);
+       ubifs_scan_a_node(c, buf, len, lnum, offs, 0);
 corrupted:
        ubifs_scanned_corruption(c, lnum, offs, buf);
        err = -EUCLEAN;
@@ -1331,8 +1331,7 @@ void ubifs_destroy_size_tree(struct ubifs_info *c)
        struct size_entry *e, *n;
 
        rbtree_postorder_for_each_entry_safe(e, n, &c->size_tree, rb) {
-               if (e->inode)
-                       iput(e->inode);
+               iput(e->inode);
                kfree(e);
        }
 
@@ -1533,8 +1532,7 @@ int ubifs_recover_size(struct ubifs_info *c)
                                err = fix_size_in_place(c, e);
                                if (err)
                                        return err;
-                               if (e->inode)
-                                       iput(e->inode);
+                               iput(e->inode);
                        }
                }