diff options
author | Cong Wang <amwang@redhat.com> | 2011-11-25 10:14:34 -0500 |
---|---|---|
committer | Cong Wang <xiyou.wangcong@gmail.com> | 2012-03-20 09:48:25 -0400 |
commit | c4bc8dcbbe7a7876d76e3f3e129a2ccec46d7cdb (patch) | |
tree | 9412b6e44738d25b35c88887489f4dd915c564f9 | |
parent | a3ac1414eb601136ba3475e841fe76ccbab5e88d (diff) |
ocfs2: remove the second argument of k[un]map_atomic()
Acked-by: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Cong Wang <amwang@redhat.com>
-rw-r--r-- | 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 78b68af3b0e3..657743254eb9 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, | |||
102 | * copy, the data is still good. */ | 102 | * copy, the data is still good. */ |
103 | if (buffer_jbd(buffer_cache_bh) | 103 | if (buffer_jbd(buffer_cache_bh) |
104 | && ocfs2_inode_is_new(inode)) { | 104 | && ocfs2_inode_is_new(inode)) { |
105 | kaddr = kmap_atomic(bh_result->b_page, KM_USER0); | 105 | kaddr = kmap_atomic(bh_result->b_page); |
106 | if (!kaddr) { | 106 | if (!kaddr) { |
107 | mlog(ML_ERROR, "couldn't kmap!\n"); | 107 | mlog(ML_ERROR, "couldn't kmap!\n"); |
108 | goto bail; | 108 | goto bail; |
@@ -110,7 +110,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, | |||
110 | memcpy(kaddr + (bh_result->b_size * iblock), | 110 | memcpy(kaddr + (bh_result->b_size * iblock), |
111 | buffer_cache_bh->b_data, | 111 | buffer_cache_bh->b_data, |
112 | bh_result->b_size); | 112 | bh_result->b_size); |
113 | kunmap_atomic(kaddr, KM_USER0); | 113 | kunmap_atomic(kaddr); |
114 | set_buffer_uptodate(bh_result); | 114 | set_buffer_uptodate(bh_result); |
115 | } | 115 | } |
116 | brelse(buffer_cache_bh); | 116 | brelse(buffer_cache_bh); |
@@ -236,13 +236,13 @@ int ocfs2_read_inline_data(struct inode *inode, struct page *page, | |||
236 | return -EROFS; | 236 | return -EROFS; |
237 | } | 237 | } |
238 | 238 | ||
239 | kaddr = kmap_atomic(page, KM_USER0); | 239 | kaddr = kmap_atomic(page); |
240 | if (size) | 240 | if (size) |
241 | memcpy(kaddr, di->id2.i_data.id_data, size); | 241 | memcpy(kaddr, di->id2.i_data.id_data, size); |
242 | /* Clear the remaining part of the page */ | 242 | /* Clear the remaining part of the page */ |
243 | memset(kaddr + size, 0, PAGE_CACHE_SIZE - size); | 243 | memset(kaddr + size, 0, PAGE_CACHE_SIZE - size); |
244 | flush_dcache_page(page); | 244 | flush_dcache_page(page); |
245 | kunmap_atomic(kaddr, KM_USER0); | 245 | kunmap_atomic(kaddr); |
246 | 246 | ||
247 | SetPageUptodate(page); | 247 | SetPageUptodate(page); |
248 | 248 | ||
@@ -689,7 +689,7 @@ static void ocfs2_clear_page_regions(struct page *page, | |||
689 | 689 | ||
690 | ocfs2_figure_cluster_boundaries(osb, cpos, &cluster_start, &cluster_end); | 690 | ocfs2_figure_cluster_boundaries(osb, cpos, &cluster_start, &cluster_end); |
691 | 691 | ||
692 | kaddr = kmap_atomic(page, KM_USER0); | 692 | kaddr = kmap_atomic(page); |
693 | 693 | ||
694 | if (from || to) { | 694 | if (from || to) { |
695 | if (from > cluster_start) | 695 | if (from > cluster_start) |
@@ -700,7 +700,7 @@ static void ocfs2_clear_page_regions(struct page *page, | |||
700 | memset(kaddr + cluster_start, 0, cluster_end - cluster_start); | 700 | memset(kaddr + cluster_start, 0, cluster_end - cluster_start); |
701 | } | 701 | } |
702 | 702 | ||
703 | kunmap_atomic(kaddr, KM_USER0); | 703 | kunmap_atomic(kaddr); |
704 | } | 704 | } |
705 | 705 | ||
706 | /* | 706 | /* |
@@ -1981,9 +1981,9 @@ static void ocfs2_write_end_inline(struct inode *inode, loff_t pos, | |||
1981 | } | 1981 | } |
1982 | } | 1982 | } |
1983 | 1983 | ||
1984 | kaddr = kmap_atomic(wc->w_target_page, KM_USER0); | 1984 | kaddr = kmap_atomic(wc->w_target_page); |
1985 | memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied); | 1985 | memcpy(di->id2.i_data.id_data + pos, kaddr + pos, *copied); |
1986 | kunmap_atomic(kaddr, KM_USER0); | 1986 | kunmap_atomic(kaddr); |
1987 | 1987 | ||
1988 | trace_ocfs2_write_end_inline( | 1988 | trace_ocfs2_write_end_inline( |
1989 | (unsigned long long)OCFS2_I(inode)->ip_blkno, | 1989 | (unsigned long long)OCFS2_I(inode)->ip_blkno, |