mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-30 02:21:15 +00:00
[PATCH] md: fix bitmap/read_sb_page so that it handles errors properly.
read_sb_page() assumed that if sync_page_io fails, the device would be marked faultly. However it isn't. So in the face of error, read_sb_page would loop forever. Redo the logic so that this cannot happen. Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
71c0805cb4
commit
ab904d6346
1 changed files with 10 additions and 9 deletions
|
@ -270,20 +270,21 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde
|
||||||
|
|
||||||
if (!page)
|
if (!page)
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
do {
|
|
||||||
ITERATE_RDEV(mddev, rdev, tmp)
|
|
||||||
if (rdev->in_sync && !rdev->faulty)
|
|
||||||
goto found;
|
|
||||||
return ERR_PTR(-EIO);
|
|
||||||
|
|
||||||
found:
|
ITERATE_RDEV(mddev, rdev, tmp) {
|
||||||
|
if (! rdev->in_sync || rdev->faulty)
|
||||||
|
continue;
|
||||||
|
|
||||||
target = (rdev->sb_offset << 1) + offset + index * (PAGE_SIZE/512);
|
target = (rdev->sb_offset << 1) + offset + index * (PAGE_SIZE/512);
|
||||||
|
|
||||||
} while (!sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ));
|
if (sync_page_io(rdev->bdev, target, PAGE_SIZE, page, READ)) {
|
||||||
|
|
||||||
page->index = index;
|
page->index = index;
|
||||||
return page;
|
return page;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
return ERR_PTR(-EIO);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
static int write_sb_page(mddev_t *mddev, long offset, struct page *page, int wait)
|
static int write_sb_page(mddev_t *mddev, long offset, struct page *page, int wait)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue