diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/alloc.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/aops.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c index 64713e149e46..447206eb5c2e 100644 --- a/fs/ocfs2/alloc.c +++ b/fs/ocfs2/alloc.c | |||
@@ -5670,7 +5670,7 @@ static void ocfs2_map_and_dirty_page(struct inode *inode, handle_t *handle, | |||
5670 | mlog_errno(ret); | 5670 | mlog_errno(ret); |
5671 | 5671 | ||
5672 | if (zero) | 5672 | if (zero) |
5673 | zero_user_page(page, from, to - from, KM_USER0); | 5673 | zero_user_segment(page, from, to); |
5674 | 5674 | ||
5675 | /* | 5675 | /* |
5676 | * Need to set the buffers we zero'd into uptodate | 5676 | * Need to set the buffers we zero'd into uptodate |
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index bc7b4cbbe8ec..82243127eebf 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c | |||
@@ -307,7 +307,7 @@ static int ocfs2_readpage(struct file *file, struct page *page) | |||
307 | * XXX sys_readahead() seems to get that wrong? | 307 | * XXX sys_readahead() seems to get that wrong? |
308 | */ | 308 | */ |
309 | if (start >= i_size_read(inode)) { | 309 | if (start >= i_size_read(inode)) { |
310 | zero_user_page(page, 0, PAGE_SIZE, KM_USER0); | 310 | zero_user(page, 0, PAGE_SIZE); |
311 | SetPageUptodate(page); | 311 | SetPageUptodate(page); |
312 | ret = 0; | 312 | ret = 0; |
313 | goto out_alloc; | 313 | goto out_alloc; |
@@ -869,7 +869,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno, | |||
869 | if (block_start >= to) | 869 | if (block_start >= to) |
870 | break; | 870 | break; |
871 | 871 | ||
872 | zero_user_page(page, block_start, bh->b_size, KM_USER0); | 872 | zero_user(page, block_start, bh->b_size); |
873 | set_buffer_uptodate(bh); | 873 | set_buffer_uptodate(bh); |
874 | mark_buffer_dirty(bh); | 874 | mark_buffer_dirty(bh); |
875 | 875 | ||
@@ -1034,7 +1034,7 @@ static void ocfs2_zero_new_buffers(struct page *page, unsigned from, unsigned to | |||
1034 | start = max(from, block_start); | 1034 | start = max(from, block_start); |
1035 | end = min(to, block_end); | 1035 | end = min(to, block_end); |
1036 | 1036 | ||
1037 | zero_user_page(page, start, end - start, KM_USER0); | 1037 | zero_user_segment(page, start, end); |
1038 | set_buffer_uptodate(bh); | 1038 | set_buffer_uptodate(bh); |
1039 | } | 1039 | } |
1040 | 1040 | ||