|
@@ -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);
|
|
|
|
|
@@ -689,7 +689,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)
|
|
@@ -700,7 +700,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);
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -1981,9 +1981,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,
|