mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
block: add a bi_error field to struct bio
Currently we have two different ways to signal an I/O error on a BIO: (1) by clearing the BIO_UPTODATE flag (2) by returning a Linux errno value to the bi_end_io callback The first one has the drawback of only communicating a single possible error (-EIO), and the second one has the drawback of not beeing persistent when bios are queued up, and are not passed along from child to parent bio in the ever more popular chaining scenario. Having both mechanisms available has the additional drawback of utterly confusing driver authors and introducing bugs where various I/O submitters only deal with one of them, and the others have to add boilerplate code to deal with both kinds of error returns. So add a new bi_error field to store an errno value directly in struct bio and remove the existing mechanisms to clean all this up. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Hannes Reinecke <[email protected]> Reviewed-by: NeilBrown <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
0034af0365
commit
4246a0b63b
95 changed files with 622 additions and 682 deletions
|
|
@ -2011,7 +2011,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
|
|||
/*check if journaling to disk has been disabled*/
|
||||
if (log->no_integrity) {
|
||||
bio->bi_iter.bi_size = 0;
|
||||
lbmIODone(bio, 0);
|
||||
lbmIODone(bio);
|
||||
} else {
|
||||
submit_bio(READ_SYNC, bio);
|
||||
}
|
||||
|
|
@ -2158,7 +2158,7 @@ static void lbmStartIO(struct lbuf * bp)
|
|||
/* check if journaling to disk has been disabled */
|
||||
if (log->no_integrity) {
|
||||
bio->bi_iter.bi_size = 0;
|
||||
lbmIODone(bio, 0);
|
||||
lbmIODone(bio);
|
||||
} else {
|
||||
submit_bio(WRITE_SYNC, bio);
|
||||
INCREMENT(lmStat.submitted);
|
||||
|
|
@ -2196,7 +2196,7 @@ static int lbmIOWait(struct lbuf * bp, int flag)
|
|||
*
|
||||
* executed at INTIODONE level
|
||||
*/
|
||||
static void lbmIODone(struct bio *bio, int error)
|
||||
static void lbmIODone(struct bio *bio)
|
||||
{
|
||||
struct lbuf *bp = bio->bi_private;
|
||||
struct lbuf *nextbp, *tail;
|
||||
|
|
@ -2212,7 +2212,7 @@ static void lbmIODone(struct bio *bio, int error)
|
|||
|
||||
bp->l_flag |= lbmDONE;
|
||||
|
||||
if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
|
||||
if (bio->bi_error) {
|
||||
bp->l_flag |= lbmERROR;
|
||||
|
||||
jfs_err("lbmIODone: I/O error in JFS log");
|
||||
|
|
|
|||
|
|
@ -276,11 +276,11 @@ static void last_read_complete(struct 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;
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
@ -331,13 +331,13 @@ static void last_write_complete(struct page *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));
|
||||
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue