lkml.org 
[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 36/60] jbd2: remove the second argument of k[un]map_atomic()
    Date
    Signed-off-by: Cong Wang <amwang@redhat.com>
    ---
    fs/jbd2/commit.c | 4 ++--
    fs/jbd2/journal.c | 12 ++++++------
    fs/jbd2/transaction.c | 4 ++--
    3 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
    index 5069b84..c067a8c 100644
    --- a/fs/jbd2/commit.c
    +++ b/fs/jbd2/commit.c
    @@ -286,10 +286,10 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
    char *addr;
    __u32 checksum;

    - addr = kmap_atomic(page, KM_USER0);
    + addr = kmap_atomic(page);
    checksum = crc32_be(crc32_sum,
    (void *)(addr + offset_in_page(bh->b_data)), bh->b_size);
    - kunmap_atomic(addr, KM_USER0);
    + kunmap_atomic(addr);

    return checksum;
    }
    diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
    index c0a5f9f..5ff8940 100644
    --- a/fs/jbd2/journal.c
    +++ b/fs/jbd2/journal.c
    @@ -345,7 +345,7 @@ repeat:
    new_offset = offset_in_page(jh2bh(jh_in)->b_data);
    }

    - mapped_data = kmap_atomic(new_page, KM_USER0);
    + mapped_data = kmap_atomic(new_page);
    /*
    * Fire data frozen trigger if data already wasn't frozen. Do this
    * before checking for escaping, as the trigger may modify the magic
    @@ -364,7 +364,7 @@ repeat:
    need_copy_out = 1;
    do_escape = 1;
    }
    - kunmap_atomic(mapped_data, KM_USER0);
    + kunmap_atomic(mapped_data);

    /*
    * Do we need to do a data copy?
    @@ -385,9 +385,9 @@ repeat:
    }

    jh_in->b_frozen_data = tmp;
    - mapped_data = kmap_atomic(new_page, KM_USER0);
    + mapped_data = kmap_atomic(new_page);
    memcpy(tmp, mapped_data + new_offset, jh2bh(jh_in)->b_size);
    - kunmap_atomic(mapped_data, KM_USER0);
    + kunmap_atomic(mapped_data);

    new_page = virt_to_page(tmp);
    new_offset = offset_in_page(tmp);
    @@ -406,9 +406,9 @@ repeat:
    * copying, we can finally do so.
    */
    if (do_escape) {
    - mapped_data = kmap_atomic(new_page, KM_USER0);
    + mapped_data = kmap_atomic(new_page);
    *((unsigned int *)(mapped_data + new_offset)) = 0;
    - kunmap_atomic(mapped_data, KM_USER0);
    + kunmap_atomic(mapped_data);
    }

    set_bh_page(new_bh, new_page, new_offset);
    diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
    index 35ae096..e5aba56 100644
    --- a/fs/jbd2/transaction.c
    +++ b/fs/jbd2/transaction.c
    @@ -783,12 +783,12 @@ done:
    "Possible IO failure.\n");
    page = jh2bh(jh)->b_page;
    offset = offset_in_page(jh2bh(jh)->b_data);
    - source = kmap_atomic(page, KM_USER0);
    + source = kmap_atomic(page);
    /* Fire data frozen trigger just before we copy the data */
    jbd2_buffer_frozen_trigger(jh, source + offset,
    jh->b_triggers);
    memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size);
    - kunmap_atomic(source, KM_USER0);
    + kunmap_atomic(source);

    /*
    * Now that the frozen data is saved off, we need to store
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-02-10 06:55    [W:4.035 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site