diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 18:23:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-18 18:23:34 +0200 |
| commit | 033ead8230c2cf9cdc2d6e1148bfdf5674012a9c (patch) | |
| tree | e730e257dda570c0994618511f6bc0d326fea173 /drivers | |
| parent | Merge tag 'xfs-for-linus-3.16-rc5' of git://oss.sgi.com/xfs/xfs (diff) | |
| parent | UBI: fastmap: do not miss bit-flips (diff) | |
| download | linux-033ead8230c2cf9cdc2d6e1148bfdf5674012a9c.tar.xz linux-033ead8230c2cf9cdc2d6e1148bfdf5674012a9c.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index b04e7d059888..0431b46d9fd9 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -125,7 +125,7 @@ static struct ubi_ainf_volume *add_vol(struct ubi_attach_info *ai, int vol_id, parent = *p; 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; else p = &(*p)->rb_right; @@ -423,7 +423,7 @@ static int scan_pool(struct ubi_device *ubi, struct ubi_attach_info *ai, pnum, err); ret = err > 0 ? UBI_BAD_FASTMAP : err; goto out; - } else if (ret == UBI_IO_BITFLIPS) + } else if (err == UBI_IO_BITFLIPS) scrub = 1; /* |