GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

jbd2: remove the second argument of k[un]map_atomic()

Browse source 
Signed-off-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Cong Wang 2011-11-25 23:14:31 +08:00 • committed by Cong Wang
parent 8fb53c46d9
commit 303a8f2afc
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fs/jbd2/commit.c
View file

@ -286,10 +286,10 @@ static __u32 jbd2_checksum_data(__u32 crc32_sum, struct buffer_head *bh)
char *addr; char *addr;
__u32 checksum; __u32 checksum;
addr = kmap_atomic(page, KM_USER0); addr = kmap_atomic(page);
checksum = crc32_be(crc32_sum, checksum = crc32_be(crc32_sum,
(void *)(addr + offset_in_page(bh->b_data)), bh->b_size); (void *)(addr + offset_in_page(bh->b_data)), bh->b_size);
kunmap_atomic(addr, KM_USER0); kunmap_atomic(addr);
return checksum; return checksum;
} }

12
fs/jbd2/journal.c
View file

@ -345,7 +345,7 @@ repeat:
new_offset = offset_in_page(jh2bh(jh_in)->b_data); 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 * Fire data frozen trigger if data already wasn't frozen. Do this
* before checking for escaping, as the trigger may modify the magic * before checking for escaping, as the trigger may modify the magic
@ -364,7 +364,7 @@ repeat:
need_copy_out = 1; need_copy_out = 1;
do_escape = 1; do_escape = 1;
} }
kunmap_atomic(mapped_data, KM_USER0); kunmap_atomic(mapped_data);
/* /*
* Do we need to do a data copy? * Do we need to do a data copy?
@ -385,9 +385,9 @@ repeat:
} }
jh_in->b_frozen_data = tmp; 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); 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_page = virt_to_page(tmp);
new_offset = offset_in_page(tmp); new_offset = offset_in_page(tmp);
@ -406,9 +406,9 @@ repeat:
* copying, we can finally do so. * copying, we can finally do so.
*/ */
if (do_escape) { if (do_escape) {
mapped_data = kmap_atomic(new_page, KM_USER0); mapped_data = kmap_atomic(new_page);
*((unsigned int *)(mapped_data + new_offset)) = 0; *((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); set_bh_page(new_bh, new_page, new_offset);

4
fs/jbd2/transaction.c
View file

@ -783,12 +783,12 @@ done:
"Possible IO failure.\n"); "Possible IO failure.\n");
page = jh2bh(jh)->b_page; page = jh2bh(jh)->b_page;
offset = offset_in_page(jh2bh(jh)->b_data); 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 */ /* Fire data frozen trigger just before we copy the data */
jbd2_buffer_frozen_trigger(jh, source + offset, jbd2_buffer_frozen_trigger(jh, source + offset,
jh->b_triggers); jh->b_triggers);
memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); 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 * Now that the frozen data is saved off, we need to store