diff options
Diffstat (limited to 'fs/jbd2/journal.c')
-rw-r--r-- | fs/jbd2/journal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index c0a5f9f1b127..5ff8940b8f02 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c | |||
@@ -345,7 +345,7 @@ repeat: | |||
345 | new_offset = offset_in_page(jh2bh(jh_in)->b_data); | 345 | new_offset = offset_in_page(jh2bh(jh_in)->b_data); |
346 | } | 346 | } |
347 | 347 | ||
348 | mapped_data = kmap_atomic(new_page, KM_USER0); | 348 | mapped_data = kmap_atomic(new_page); |
349 | /* | 349 | /* |
350 | * Fire data frozen trigger if data already wasn't frozen. Do this | 350 | * Fire data frozen trigger if data already wasn't frozen. Do this |
351 | * before checking for escaping, as the trigger may modify the magic | 351 | * before checking for escaping, as the trigger may modify the magic |
@@ -364,7 +364,7 @@ repeat: | |||
364 | need_copy_out = 1; | 364 | need_copy_out = 1; |
365 | do_escape = 1; | 365 | do_escape = 1; |
366 | } | 366 | } |
367 | kunmap_atomic(mapped_data, KM_USER0); | 367 | kunmap_atomic(mapped_data); |
368 | 368 | ||
369 | /* | 369 | /* |
370 | * Do we need to do a data copy? | 370 | * Do we need to do a data copy? |
@@ -385,9 +385,9 @@ repeat: | |||
385 | } | 385 | } |
386 | 386 | ||
387 | jh_in->b_frozen_data = tmp; | 387 | jh_in->b_frozen_data = tmp; |
388 | mapped_data = kmap_atomic(new_page, KM_USER0); | 388 | mapped_data = kmap_atomic(new_page); |
389 | memcpy(tmp, mapped_data + new_offset, jh2bh(jh_in)->b_size); | 389 | memcpy(tmp, mapped_data + new_offset, jh2bh(jh_in)->b_size); |
390 | kunmap_atomic(mapped_data, KM_USER0); | 390 | kunmap_atomic(mapped_data); |
391 | 391 | ||
392 | new_page = virt_to_page(tmp); | 392 | new_page = virt_to_page(tmp); |
393 | new_offset = offset_in_page(tmp); | 393 | new_offset = offset_in_page(tmp); |
@@ -406,9 +406,9 @@ repeat: | |||
406 | * copying, we can finally do so. | 406 | * copying, we can finally do so. |
407 | */ | 407 | */ |
408 | if (do_escape) { | 408 | if (do_escape) { |
409 | mapped_data = kmap_atomic(new_page, KM_USER0); | 409 | mapped_data = kmap_atomic(new_page); |
410 | *((unsigned int *)(mapped_data + new_offset)) = 0; | 410 | *((unsigned int *)(mapped_data + new_offset)) = 0; |
411 | kunmap_atomic(mapped_data, KM_USER0); | 411 | kunmap_atomic(mapped_data); |
412 | } | 412 | } |
413 | 413 | ||
414 | set_bh_page(new_bh, new_page, new_offset); | 414 | set_bh_page(new_bh, new_page, new_offset); |