ubi,ubifs: sync with linux v4.2

[u-boot] / drivers / mtd / ubi / misc.c

diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 49530b7448f9df8d7653658682b1a5dafe53b7ce..504865b8e6e57207e14a371b7b39982544ff3333 100644 (file)
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -63,6 +63,8 @@ int ubi_check_volume(struct ubi_device *ubi, int vol_id)
        for (i = 0; i < vol->used_ebs; i++) {
                int size;
 
+               cond_resched();
+
                if (i == vol->used_ebs - 1)
                        size = vol->last_eb_bytes;
                else
@@ -100,7 +102,7 @@ void ubi_update_reserved(struct ubi_device *ubi)
        ubi->avail_pebs -= need;
        ubi->rsvd_pebs += need;
        ubi->beb_rsvd_pebs += need;
-       ubi_msg("reserved more %d PEBs for bad PEB handling", need);
+       ubi_msg(ubi, "reserved more %d PEBs for bad PEB handling", need);
 }
 
 /**
@@ -117,7 +119,7 @@ void ubi_calculate_reserved(struct ubi_device *ubi)
        ubi->beb_rsvd_level = ubi->bad_peb_limit - ubi->bad_peb_count;
        if (ubi->beb_rsvd_level < 0) {
                ubi->beb_rsvd_level = 0;
-               ubi_warn("number of bad PEBs (%d) is above the expected limit (%d), not reserving any PEBs for bad PEB handling, will use available PEBs (if any)",
+               ubi_warn(ubi, "number of bad PEBs (%d) is above the expected limit (%d), not reserving any PEBs for bad PEB handling, will use available PEBs (if any)",
                         ubi->bad_peb_count, ubi->bad_peb_limit);
        }
 }