diff options
| author | Liu Bo <bo.li.liu@oracle.com> | 2014-08-19 23:33:13 +0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-09-17 15:12:21 +0200 |
| commit | 8f543e8182632771ed610a88a7b8594b3c6f6820 (patch) | |
| tree | 1387155c9a37a0d808210a3f5a41e8db95fe2fe1 /fs | |
| parent | 28758933a321c0eb053fa6f85c9426882bf7e44c (diff) | |
Btrfs: fix crash on endio of reading corrupted block
commit 38c1c2e44bacb37efd68b90b3f70386a8ee370ee upstream.
The crash is
------------[ cut here ]------------
kernel BUG at fs/btrfs/extent_io.c:2124!
[...]
Workqueue: btrfs-endio normal_work_helper [btrfs]
RIP: 0010:[<ffffffffa02d6055>] [<ffffffffa02d6055>] end_bio_extent_readpage+0xb45/0xcd0 [btrfs]
This is in fact a regression.
It is because we forgot to increase @offset properly in reading corrupted block,
so that the @offset remains, and this leads to checksum errors while reading
left blocks queued up in the same bio, and then ends up with hiting the above
BUG_ON.
Reported-by: Chris Murphy <lists@colorremedies.com>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/extent_io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index b395791dd923..594bbfd4996e 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2485,6 +2485,7 @@ static void end_bio_extent_readpage(struct bio *bio, int err) test_bit(BIO_UPTODATE, &bio->bi_flags); if (err) uptodate = 0; + offset += len; continue; } } |