diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-26 18:57:26 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-26 18:57:26 -0700 |
commit | fc2ed77b9d6b579d61024163c74f41c24394fcc7 (patch) | |
tree | 903d80ba1b1fc0eb15e122a8c12a72f72e7ed2de /fs/jbd2/commit.c | |
parent | 3d04d42312eacc68fbcddea337f7eb34bc035dfb (diff) | |
parent | 50269e19ad990e79eeda101fc6df80cffd5d4831 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'fs/jbd2/commit.c')
-rw-r--r-- | fs/jbd2/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 5069b8475150..c067a8cae63b 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; } |