projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block: add a bi_error field to struct bio
[cascardo/linux.git]
/
fs
/
jfs
/
jfs_metapage.c
diff --git
a/fs/jfs/jfs_metapage.c
b/fs/jfs/jfs_metapage.c
index
16a0922
..
a3eb316
100644
(file)
--- a/
fs/jfs/jfs_metapage.c
+++ b/
fs/jfs/jfs_metapage.c
@@
-276,11
+276,11
@@
static void last_read_complete(struct page *page)
unlock_page(page);
}
unlock_page(page);
}
-static void metapage_read_end_io(struct bio *bio
, int err
)
+static void metapage_read_end_io(struct bio *bio)
{
struct page *page = bio->bi_private;
{
struct page *page = bio->bi_private;
- if (
!test_bit(BIO_UPTODATE, &bio->bi_flags)
) {
+ if (
bio->bi_error
) {
printk(KERN_ERR "metapage_read_end_io: I/O error\n");
SetPageError(page);
}
printk(KERN_ERR "metapage_read_end_io: I/O error\n");
SetPageError(page);
}
@@
-331,13
+331,13
@@
static void last_write_complete(struct page *page)
end_page_writeback(page);
}
end_page_writeback(page);
}
-static void metapage_write_end_io(struct bio *bio
, int err
)
+static void metapage_write_end_io(struct bio *bio)
{
struct page *page = bio->bi_private;
BUG_ON(!PagePrivate(page));
{
struct page *page = bio->bi_private;
BUG_ON(!PagePrivate(page));
- if (
! test_bit(BIO_UPTODATE, &bio->bi_flags)
) {
+ if (
bio->bi_error
) {
printk(KERN_ERR "metapage_write_end_io: I/O error\n");
SetPageError(page);
}
printk(KERN_ERR "metapage_write_end_io: I/O error\n");
SetPageError(page);
}