Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 033ead82 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs 

Pull UBI fixes from Artem Bityutskiy:
 "Two UBI fastmap-related fixes for v3.16:

   - fix UBI fastmap support which we broke in 3.16-rc1 by reversing the
     volumes RB-tree sorting criteria.
   - make sure that we scrub all PEBs where we see bit-flips - we were
     missing some of them when the fastmap feature was enabled"

* tag 'upstream-3.16-rc6' of git://git.infradead.org/linux-ubifs:
  UBI: fastmap: do not miss bit-flips
  UBI: fix the volumes tree sorting criteria
parents 847f56eb 44305ebd

drivers/mtd/ubi/fastmap.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ static struct ubi_ainf_volume *add_vol(struct ubi_attach_info *ai, int vol_id, 
		parent = *p;

		parent = *p;

		av = rb_entry(parent, struct ubi_ainf_volume, rb);

		av = rb_entry(parent, struct ubi_ainf_volume, rb);





		if (vol_id < av->vol_id)

		if (vol_id > av->vol_id)

			p = &(*p)->rb_left;

			p = &(*p)->rb_left;

		else

		else

			p = &(*p)->rb_right;

			p = &(*p)->rb_right;
@@ -423,7 +423,7 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, 
				pnum, err);

				pnum, err);

			ret = err > 0 ? UBI_BAD_FASTMAP : err;

			ret = err > 0 ? UBI_BAD_FASTMAP : err;

			goto out;

			goto out;

		} else if (ret == UBI_IO_BITFLIPS)

		} else if (err == UBI_IO_BITFLIPS)

			scrub = 1;

			scrub = 1;





		/*

		/*