diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:31 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:23 -0400 |
commit | 8fb53c46d9c9322fc5a8e53038ceb0d243059c25 (patch) | |
tree | 7fc80c0f840fd90dd3347de226935a7d0d7c950a | |
parent | d93492855ff307ce9d699e36d966af3420b80bb3 (diff) |
jbd: remove the second argument of k[un]map_atomic()
Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Cong Wang <amwang@redhat.com>
-rw-r--r-- | fs/jbd/journal.c | 12 | ||||
-rw-r--r-- | fs/jbd/transaction.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 59c09f9541b5..e49e81bb80ef 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
@@ -328,7 +328,7 @@ repeat: | |||
328 | new_offset = offset_in_page(jh2bh(jh_in)->b_data); | 328 | new_offset = offset_in_page(jh2bh(jh_in)->b_data); |
329 | } | 329 | } |
330 | 330 | ||
331 | mapped_data = kmap_atomic(new_page, KM_USER0); | 331 | mapped_data = kmap_atomic(new_page); |
332 | /* | 332 | /* |
333 | * Check for escaping | 333 | * Check for escaping |
334 | */ | 334 | */ |
@@ -337,7 +337,7 @@ repeat: | |||
337 | need_copy_out = 1; | 337 | need_copy_out = 1; |
338 | do_escape = 1; | 338 | do_escape = 1; |
339 | } | 339 | } |
340 | kunmap_atomic(mapped_data, KM_USER0); | 340 | kunmap_atomic(mapped_data); |
341 | 341 | ||
342 | /* | 342 | /* |
343 | * Do we need to do a data copy? | 343 | * Do we need to do a data copy? |
@@ -354,9 +354,9 @@ repeat: | |||
354 | } | 354 | } |
355 | 355 | ||
356 | jh_in->b_frozen_data = tmp; | 356 | jh_in->b_frozen_data = tmp; |
357 | mapped_data = kmap_atomic(new_page, KM_USER0); | 357 | mapped_data = kmap_atomic(new_page); |
358 | memcpy(tmp, mapped_data + new_offset, jh2bh(jh_in)->b_size); | 358 | memcpy(tmp, mapped_data + new_offset, jh2bh(jh_in)->b_size); |
359 | kunmap_atomic(mapped_data, KM_USER0); | 359 | kunmap_atomic(mapped_data); |
360 | 360 | ||
361 | new_page = virt_to_page(tmp); | 361 | new_page = virt_to_page(tmp); |
362 | new_offset = offset_in_page(tmp); | 362 | new_offset = offset_in_page(tmp); |
@@ -368,9 +368,9 @@ repeat: | |||
368 | * copying, we can finally do so. | 368 | * copying, we can finally do so. |
369 | */ | 369 | */ |
370 | if (do_escape) { | 370 | if (do_escape) { |
371 | mapped_data = kmap_atomic(new_page, KM_USER0); | 371 | mapped_data = kmap_atomic(new_page); |
372 | *((unsigned int *)(mapped_data + new_offset)) = 0; | 372 | *((unsigned int *)(mapped_data + new_offset)) = 0; |
373 | kunmap_atomic(mapped_data, KM_USER0); | 373 | kunmap_atomic(mapped_data); |
374 | } | 374 | } |
375 | 375 | ||
376 | set_bh_page(new_bh, new_page, new_offset); | 376 | set_bh_page(new_bh, new_page, new_offset); |
diff --git a/fs/jbd/transaction.c b/fs/jbd/transaction.c index 7fce94b04bc3..b2a7e5244e39 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c | |||
@@ -718,9 +718,9 @@ done: | |||
718 | "Possible IO failure.\n"); | 718 | "Possible IO failure.\n"); |
719 | page = jh2bh(jh)->b_page; | 719 | page = jh2bh(jh)->b_page; |
720 | offset = offset_in_page(jh2bh(jh)->b_data); | 720 | offset = offset_in_page(jh2bh(jh)->b_data); |
721 | source = kmap_atomic(page, KM_USER0); | 721 | source = kmap_atomic(page); |
722 | memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); | 722 | memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); |
723 | kunmap_atomic(source, KM_USER0); | 723 | kunmap_atomic(source); |
724 | } | 724 | } |
725 | jbd_unlock_bh_state(bh); | 725 | jbd_unlock_bh_state(bh); |
726 | 726 | ||