Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Cong Wang and committed by
Cong Wang
c4bc8dcb a3ac1414

+8 -8
+8 -8
fs/ocfs2/aops.c
··· 102 102 * copy, the data is still good. */ 103 103 if (buffer_jbd(buffer_cache_bh) 104 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 106 if (!kaddr) { 107 107 mlog(ML_ERROR, "couldn't kmap!\n"); 108 108 goto bail; ··· 110 110 memcpy(kaddr + (bh_result->b_size * iblock), 111 111 buffer_cache_bh->b_data, 112 112 bh_result->b_size); 113 - kunmap_atomic(kaddr, KM_USER0); 113 + kunmap_atomic(kaddr); 114 114 set_buffer_uptodate(bh_result); 115 115 } 116 116 brelse(buffer_cache_bh); ··· 236 236 return -EROFS; 237 237 } 238 238 239 - kaddr = kmap_atomic(page, KM_USER0); 239 + kaddr = kmap_atomic(page); 240 240 if (size) 241 241 memcpy(kaddr, di->id2.i_data.id_data, size); 242 242 /* Clear the remaining part of the page */ 243 243 memset(kaddr + size, 0, PAGE_CACHE_SIZE - size); 244 244 flush_dcache_page(page); 245 - kunmap_atomic(kaddr, KM_USER0); 245 + kunmap_atomic(kaddr); 246 246 247 247 SetPageUptodate(page); 248 248 ··· 689 689 690 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 694 if (from || to) { 695 695 if (from > cluster_start) ··· 700 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 1981 } 1982 1982 } 1983 1983 1984 - kaddr = kmap_atomic(wc->w_target_page, KM_USER0); 1984 + kaddr = kmap_atomic(wc->w_target_page); 1985 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 1988 trace_ocfs2_write_end_inline( 1989 1989 (unsigned long long)OCFS2_I(inode)->ip_blkno,