lkml.org 
[lkml]   [2009]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 02/28] md: fix some (more) errors with bitmaps on devices larger than 2TB.
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: NeilBrown <neilb@suse.de>

    commit db305e507d554430a69ede901a6308e6ecb72349 upstream.

    If a write intent bitmap covers more than 2TB, we sometimes work with
    values beyond 32bit, so these need to be sector_t. This patches
    add the required casts to some unsigned longs that are being shifted
    up.

    This will affect any raid10 larger than 2TB, or any raid1/4/5/6 with
    member devices that are larger than 2TB.

    Signed-off-by: NeilBrown <neilb@suse.de>
    Reported-by: "Mario 'BitKoenig' Holbe" <Mario.Holbe@TU-Ilmenau.DE>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/md/bitmap.c | 18 +++++++++++-------
    1 file changed, 11 insertions(+), 7 deletions(-)

    --- a/drivers/md/bitmap.c
    +++ b/drivers/md/bitmap.c
    @@ -1013,9 +1013,11 @@ static int bitmap_init_from_disk(struct
    kunmap_atomic(paddr, KM_USER0);
    if (b) {
    /* if the disk bit is set, set the memory bit */
    - bitmap_set_memory_bits(bitmap, i << CHUNK_BLOCK_SHIFT(bitmap),
    - ((i+1) << (CHUNK_BLOCK_SHIFT(bitmap)) >= start)
    - );
    + int needed = ((sector_t)(i+1) << (CHUNK_BLOCK_SHIFT(bitmap))
    + >= start);
    + bitmap_set_memory_bits(bitmap,
    + (sector_t)i << CHUNK_BLOCK_SHIFT(bitmap),
    + needed);
    bit_cnt++;
    set_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);
    }
    @@ -1151,8 +1153,9 @@ void bitmap_daemon_work(struct bitmap *b
    spin_lock_irqsave(&bitmap->lock, flags);
    clear_page_attr(bitmap, page, BITMAP_PAGE_CLEAN);
    }
    - bmc = bitmap_get_counter(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),
    - &blocks, 0);
    + bmc = bitmap_get_counter(bitmap,
    + (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap),
    + &blocks, 0);
    if (bmc) {
    /*
    if (j < 100) printk("bitmap: j=%lu, *bmc = 0x%x\n", j, *bmc);
    @@ -1166,7 +1169,8 @@ void bitmap_daemon_work(struct bitmap *b
    } else if (*bmc == 1) {
    /* we can clear the bit */
    *bmc = 0;
    - bitmap_count_page(bitmap, j << CHUNK_BLOCK_SHIFT(bitmap),
    + bitmap_count_page(bitmap,
    + (sector_t)j << CHUNK_BLOCK_SHIFT(bitmap),
    -1);

    /* clear the bit */
    @@ -1482,7 +1486,7 @@ void bitmap_dirty_bits(struct bitmap *bi
    unsigned long chunk;

    for (chunk = s; chunk <= e; chunk++) {
    - sector_t sec = chunk << CHUNK_BLOCK_SHIFT(bitmap);
    + sector_t sec = (sector_t)chunk << CHUNK_BLOCK_SHIFT(bitmap);
    bitmap_set_memory_bits(bitmap, sec, 1);
    bitmap_file_set_bit(bitmap, sec);
    }



    \
     
     \ /
      Last update: 2009-05-15 01:07    [W:3.568 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site