[Drbd-dev] [PATCH 58/60] drbd: remove the second argument of k[un]map_atomic()

[Robert Kim App and Facebook Marketing]

Guys... in my email... the code really breaks up bad... is there a version
of the code without any line-breaks????

On Fri, Feb 10, 2012 at 2:40 PM, Cong Wang <amwang at redhat.com> wrote:

> Signed-off-by: Cong Wang <amwang at redhat.com>
> ---
>  drivers/block/drbd/drbd_bitmap.c |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_bitmap.c
> b/drivers/block/drbd/drbd_bitmap.c
> index 39de9ff..3030201 100644
> --- a/drivers/block/drbd/drbd_bitmap.c
> +++ b/drivers/block/drbd/drbd_bitmap.c
> @@ -289,7 +289,7 @@ static unsigned int bm_bit_to_page_idx(struct
> drbd_bitmap *b, u64 bitnr)
>        return page_nr;
>  }
>
> -static unsigned long *__bm_map_pidx(struct drbd_bitmap *b, unsigned int
> idx, const enum km_type km)
> +static unsigned long *__bm_map_pidx(struct drbd_bitmap *b, unsigned int
> idx)
>  {
>        struct page *page = b->bm_pages[idx];
>        return (unsigned long *) kmap_atomic(page);
> @@ -551,7 +551,7 @@ static unsigned long bm_count_bits(struct drbd_bitmap
> *b)
>        }
>        /* last (or only) page */
>        last_word = ((b->bm_bits - 1) & BITS_PER_PAGE_MASK) >> LN2_BPL;
> -       p_addr = __bm_map_pidx(b, idx, KM_USER0);
> +       p_addr = __bm_map_pidx(b, idx);
>        for (i = 0; i < last_word; i++)
>                bits += hweight_long(p_addr[i]);
>        p_addr[last_word] &= cpu_to_lel(mask);
> @@ -559,7 +559,7 @@ static unsigned long bm_count_bits(struct drbd_bitmap
> *b)
>        /* 32bit arch, may have an unused padding long */
>        if (BITS_PER_LONG == 32 && (last_word & 1) == 0)
>                p_addr[last_word+1] = 0;
> -       __bm_unmap(p_addr, KM_USER0);
> +       __bm_unmap(p_addr);
>        return bits;
>  }
>
> @@ -970,11 +970,11 @@ static void bm_page_io_async(struct bm_aio_ctx *ctx,
> int page_nr, int rw) __must
>                 * to use pre-allocated page pool */
>                void *src, *dest;
>                page = alloc_page(__GFP_HIGHMEM|__GFP_WAIT);
> -               dest = kmap_atomic(page, KM_USER0);
> -               src = kmap_atomic(b->bm_pages[page_nr], KM_USER1);
> +               dest = kmap_atomic(page);
> +               src = kmap_atomic(b->bm_pages[page_nr]);
>                memcpy(dest, src, PAGE_SIZE);
> -               kunmap_atomic(src, KM_USER1);
> -               kunmap_atomic(dest, KM_USER0);
> +               kunmap_atomic(src);
> +               kunmap_atomic(dest);
>                bm_store_page_idx(page, page_nr);
>        } else
>                page = b->bm_pages[page_nr];
> --
> 1.7.7.6
>
>
--
Robert Q Kim
eBook Programmer and iBooks Consultant
http://www.youtube.com/watch?v=INXa_eTlHWk
2611 S Coast Highway
San Diego, CA 92007
310 598 1606
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linbit.com/pipermail/drbd-dev/attachments/20120212/7f3caa59/attachment.htm>