]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
btrfs: reada: Fix in-segment calculation for reada
authorZhao Lei <zhaolei@cn.fujitsu.com>
Fri, 18 Dec 2015 13:33:05 +0000 (21:33 +0800)
committerDavid Sterba <dsterba@suse.com>
Tue, 16 Feb 2016 12:21:45 +0000 (13:21 +0100)
reada_zone->end is end pos of segment:
 end = start + cache->key.offset - 1;

So we need to use "<=" in condition to judge is a pos in the
segment.

The problem happened rearly, because logical pos rarely pointed
to last 4k of a blockgroup, but we need to fix it to make code
right in logic.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/reada.c

index 619f92963e27102fb47a6f119b65451bdf959bef..49b3fb73ffbfcd5d955e4dc2d7955c1d4c20987b 100644 (file)
@@ -265,7 +265,7 @@ static struct reada_zone *reada_find_zone(struct btrfs_fs_info *fs_info,
        spin_unlock(&fs_info->reada_lock);
 
        if (ret == 1) {
-               if (logical >= zone->start && logical < zone->end)
+               if (logical >= zone->start && logical <= zone->end)
                        return zone;
                spin_lock(&fs_info->reada_lock);
                kref_put(&zone->refcnt, reada_zone_release);
@@ -679,7 +679,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
         */
        ret = radix_tree_gang_lookup(&dev->reada_extents, (void **)&re,
                                     dev->reada_next >> PAGE_CACHE_SHIFT, 1);
-       if (ret == 0 || re->logical >= dev->reada_curr_zone->end) {
+       if (ret == 0 || re->logical > dev->reada_curr_zone->end) {
                ret = reada_pick_zone(dev);
                if (!ret) {
                        spin_unlock(&fs_info->reada_lock);