Joel Becker
2011-Dec-01 20:18 UTC
[Ocfs2-devel] [PATCH 44/62] ocfs2: remove the second argument of k[un]map_atomic()
On Sun, Nov 27, 2011 at 01:27:24PM +0800, Cong Wang wrote:> > Signed-off-by: Cong Wang <amwang at redhat.com>Acked-by: Joel Becker <jlbec at evilplan.org> I'm presuming you'll handle pushing this with the entire series. Joel> --- > fs/ocfs2/aops.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c > index c1efe93..61f93a5 100644 > --- a/fs/ocfs2/aops.c > +++ b/fs/ocfs2/aops.c > @@ -102,7 +102,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, > * copy, the data is still good. */ > if (buffer_jbd(buffer_cache_bh) > && ocfs2_inode_is_new(inode)) { > - kaddr = kmap_atomic(bh_result->b_page, KM_USER0); > + kaddr = kmap_atomic(bh_result->b_page); > if (!kaddr) { > mlog(ML_ERROR, "couldn't kmap!\n"); > goto bail; > @@ -110,7 +110,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, > memcpy(kaddr + (bh_result->b_size * iblock), > buffer_cache_bh->b_data, > bh_result->b_size); > - kunmap_atomic(kaddr, KM_USER0); > + kunmap_atomic(kaddr); > set_buffer_uptodate(bh_result); > } > brelse(buffer_cache_bh); > @@ -236,13 +236,13 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, > return -EROFS; > } > > - kaddr = kmap_atomic(page, KM_USER0); > + kaddr = kmap_atomic(page); > if (size) > memcpy(kaddr, di->id2.i_data.id_data, size); > /* Clear the remaining part of the page */ > memset(kaddr + size, 0, PAGE_CACHE_SIZE - size); > flush_dcache_page(page); > - kunmap_atomic(kaddr, KM_USER0); > + kunmap_atomic(kaddr); > > SetPageUptodate(page); > > @@ -671,7 +671,7 @@ static void ocfs2_clear_page_regions(struct page *page, > > ocfs2_figure_cluster_boundaries(osb, cpos, &cluster_start, &cluster_end); > > - kaddr = kmap_atomic(page, KM_USER0); > + kaddr = kmap_atomic(page); > > if (from || to) { > if (from > cluster_start) > @@ -682,7 +682,7 @@ static void ocfs2_clear_page_regions(struct page *page, > memset(kaddr + cluster_start, 0, cluster_end - cluster_start); > } > > - kunmap_atomic(kaddr, KM_USER0); > + kunmap_atomic(kaddr); > } > > /* > @@ -1928,9 +1928,9 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos, > } > } > > - kaddr = kmap_atomic(wc->w_target_page, KM_USER0); > + kaddr = kmap_atomic(wc->w_target_page); > memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied); > - kunmap_atomic(kaddr, KM_USER0); > + kunmap_atomic(kaddr); > > trace_ocfs2_write_end_inline( > (unsigned long long)OCFS2_I(inode)->ip_blkno, > -- > 1.7.4.4 >-- Life's Little Instruction Book #94 "Make it a habit to do nice things for people who will never find out." http://www.jlbec.org/ jlbec at evilplan.org
Andrew Morton
2011-Dec-02 02:29 UTC
[Ocfs2-devel] [PATCH 44/62] ocfs2: remove the second argument of k[un]map_atomic()
On Fri, 02 Dec 2011 10:04:27 +0800 Cong Wang <amwang at redhat.com> wrote:> ___ 2011___12___02___ 04:18, Joel Becker ______: > > On Sun, Nov 27, 2011 at 01:27:24PM +0800, Cong Wang wrote: > >> > >> Signed-off-by: Cong Wang<amwang at redhat.com> > > > > Acked-by: Joel Becker<jlbec at evilplan.org> > > > > I'm presuming you'll handle pushing this with the entire series. > > > > Yeah, I hope either Andrew can take all of themwaaay too many patches ;)> or this can be merged into trivial tree.I'd suggest you ask Stephen to add the git tree to -next. Once it's all suitably reviewed/acked/etc, and we're in the merge window, ask Linus to pull it.