diff --git a/[refs] b/[refs] index 24b31ec2b8d0..3a0a020590c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c309df07868baa8b05d2a70637096465746fdbb5 +refs/heads/master: 00d01bc17cc2807292303961519d9c005794eb1d diff --git a/trunk/fs/btrfs/scrub.c b/trunk/fs/btrfs/scrub.c index 87a2f1273136..6dfed0c27ac3 100644 --- a/trunk/fs/btrfs/scrub.c +++ b/trunk/fs/btrfs/scrub.c @@ -631,7 +631,8 @@ static int scrub_page(struct scrub_dev *sdev, u64 logical, u64 len, if (sbio->count == 0) { sbio->physical = physical; sbio->logical = logical; - } else if (sbio->physical + sbio->count * PAGE_SIZE != physical) { + } else if (sbio->physical + sbio->count * PAGE_SIZE != physical || + sbio->logical + sbio->count * PAGE_SIZE != logical) { scrub_submit(sdev); goto again; }