lkml.org 
[lkml]   [2006]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 002 of 5] md: Return a non-zero error to bi_end_io as appropriate in raid5.

    Currently raid5 depends on clearing the BIO_UPTODATE flag to signal an
    error to higher levels. While this should be sufficient, it is safer
    to explicitly set the error code as well - less room for confusion.

    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./drivers/md/raid5.c | 16 ++++++++++++----
    1 file changed, 12 insertions(+), 4 deletions(-)

    diff .prev/drivers/md/raid5.c ./drivers/md/raid5.c
    --- .prev/drivers/md/raid5.c 2006-12-07 15:33:40.000000000 +1100
    +++ ./drivers/md/raid5.c 2006-12-07 15:44:41.000000000 +1100
    @@ -1818,7 +1818,9 @@ static void handle_stripe5(struct stripe
    return_bi = bi->bi_next;
    bi->bi_next = NULL;
    bi->bi_size = 0;
    - bi->bi_end_io(bi, bytes, 0);
    + bi->bi_end_io(bi, bytes,
    + test_bit(BIO_UPTODATE, &bi->bi_flags)
    + ? 0 : -EIO);
    }
    for (i=disks; i-- ;) {
    int rw;
    @@ -2359,7 +2361,9 @@ static void handle_stripe6(struct stripe
    return_bi = bi->bi_next;
    bi->bi_next = NULL;
    bi->bi_size = 0;
    - bi->bi_end_io(bi, bytes, 0);
    + bi->bi_end_io(bi, bytes,
    + test_bit(BIO_UPTODATE, &bi->bi_flags)
    + ? 0 : -EIO);
    }
    for (i=disks; i-- ;) {
    int rw;
    @@ -2859,7 +2863,9 @@ static int make_request(request_queue_t
    if ( rw == WRITE )
    md_write_end(mddev);
    bi->bi_size = 0;
    - bi->bi_end_io(bi, bytes, 0);
    + bi->bi_end_io(bi, bytes,
    + test_bit(BIO_UPTODATE, &bi->bi_flags)
    + ? 0 : -EIO);
    }
    return 0;
    }
    @@ -3127,7 +3133,9 @@ static int retry_aligned_read(raid5_con
    int bytes = raid_bio->bi_size;

    raid_bio->bi_size = 0;
    - raid_bio->bi_end_io(raid_bio, bytes, 0);
    + raid_bio->bi_end_io(raid_bio, bytes,
    + test_bit(BIO_UPTODATE, &raid_bio->bi_flags)
    + ? 0 : -EIO);
    }
    if (atomic_dec_and_test(&conf->active_aligned_reads))
    wake_up(&conf->wait_for_stripe);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2006-12-08 02:11    [W:2.364 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site