|
@@ -500,14 +500,14 @@ repeat:
|
|
|
|
|
|
/* wait for read completion */
|
|
/* wait for read completion */
|
|
lock_page(page);
|
|
lock_page(page);
|
|
- if (unlikely(!PageUptodate(page))) {
|
|
|
|
- f2fs_put_page(page, 1);
|
|
|
|
- return ERR_PTR(-EIO);
|
|
|
|
- }
|
|
|
|
if (unlikely(page->mapping != mapping)) {
|
|
if (unlikely(page->mapping != mapping)) {
|
|
f2fs_put_page(page, 1);
|
|
f2fs_put_page(page, 1);
|
|
goto repeat;
|
|
goto repeat;
|
|
}
|
|
}
|
|
|
|
+ if (unlikely(!PageUptodate(page))) {
|
|
|
|
+ f2fs_put_page(page, 1);
|
|
|
|
+ return ERR_PTR(-EIO);
|
|
|
|
+ }
|
|
return page;
|
|
return page;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1647,14 +1647,14 @@ repeat:
|
|
__submit_bio(sbi, READ_SYNC, bio, DATA);
|
|
__submit_bio(sbi, READ_SYNC, bio, DATA);
|
|
|
|
|
|
lock_page(page);
|
|
lock_page(page);
|
|
- if (unlikely(!PageUptodate(page))) {
|
|
|
|
- err = -EIO;
|
|
|
|
- goto fail;
|
|
|
|
- }
|
|
|
|
if (unlikely(page->mapping != mapping)) {
|
|
if (unlikely(page->mapping != mapping)) {
|
|
f2fs_put_page(page, 1);
|
|
f2fs_put_page(page, 1);
|
|
goto repeat;
|
|
goto repeat;
|
|
}
|
|
}
|
|
|
|
+ if (unlikely(!PageUptodate(page))) {
|
|
|
|
+ err = -EIO;
|
|
|
|
+ goto fail;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
out_update:
|
|
out_update:
|
|
SetPageUptodate(page);
|
|
SetPageUptodate(page);
|