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

Commit 87ca28cb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Exclude holes from the block map." am: 95811813 am: 4969b45d am: de72054e

Change-Id: I46db3c1d99ab77d04171b7067e6303d91e626400
parents 0ea8dc1c de72054e
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -251,6 +251,12 @@ class SparseImage(object):
      for line in f:
        fn, ranges_text = line.rstrip().split(None, 1)
        ranges = rangelib.RangeSet.parse(ranges_text)

        # Note: e2fsdroid records holes in the extent tree as "0" blocks.
        # This causes confusion because clobbered_blocks always includes
        # the superblock (physical block #0). Since the 0 blocks here do
        # not represent actual physical blocks, remove them from the set.
        ranges = ranges.subtract(rangelib.RangeSet("0"))
        ranges.extra['text_str'] = ranges_text

        if allow_shared_blocks: