| Submitter | Amerigo Wang |
|---|---|
| Date | Nov. 27, 2011, 5:27 a.m. |
| Message ID | <1322371662-26166-38-git-send-email-amwang@redhat.com> |
| Download | mbox | patch |
| Permalink | /patch/127853/ |
| State | Not Applicable |
| Headers | show |
Comments
On Sun 27-11-11 13:27:17, Cong Wang wrote: > > Signed-off-by: Cong Wang <amwang@redhat.com> Acked-by: Jan Kara <jack@suse.cz> Honza > --- > fs/jbd/journal.c | 12 ++++++------ > 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 fea8dd6..de8ae3e 100644 > --- a/fs/jbd/journal.c > +++ b/fs/jbd/journal.c > @@ -328,7 +328,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); > /* > * Check for escaping > */ > @@ -337,7 +337,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? > @@ -354,9 +354,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); > @@ -368,9 +368,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/jbd/transaction.c b/fs/jbd/transaction.c > index 7e59c6e..e59a112 100644 > --- a/fs/jbd/transaction.c > +++ b/fs/jbd/transaction.c > @@ -712,9 +712,9 @@ 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); > memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); > - kunmap_atomic(source, KM_USER0); > + kunmap_atomic(source); > } > jbd_unlock_bh_state(bh); > > -- > 1.7.4.4 >
Patch
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index fea8dd6..de8ae3e 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -328,7 +328,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); /* * Check for escaping */ @@ -337,7 +337,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? @@ -354,9 +354,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); @@ -368,9 +368,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/jbd/transaction.c b/fs/jbd/transaction.c index 7e59c6e..e59a112 100644 --- a/fs/jbd/transaction.c +++ b/fs/jbd/transaction.c @@ -712,9 +712,9 @@ 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); memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); - kunmap_atomic(source, KM_USER0); + kunmap_atomic(source); } jbd_unlock_bh_state(bh);
Signed-off-by: Cong Wang <amwang@redhat.com> --- fs/jbd/journal.c | 12 ++++++------ fs/jbd/transaction.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-)