From dda887e4094e8ff2feec9f443c6eb8014a2f0b81 Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Wed, 20 Jun 2007 17:15:10 -0700 Subject: [PATCH] --- yaml --- r: 60423 b: refs/heads/master c: 54c57dc3b6578356c0a428c767d4bf080254a2ee h: refs/heads/master i: 60421: 3c4c138501ef94aa04a6b2fa312d957cf3b72789 60419: c43a7a9d6d6c0eb2623c1b2315e0d38ee4374aa8 60415: c418ddf11b6f025e3216a1388bac747f2634bea9 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/aops.c | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 10edf88bfba5..d304a5f1c33c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b25801038da5823bba1b5440a57ca68afc51b6bd +refs/heads/master: 54c57dc3b6578356c0a428c767d4bf080254a2ee diff --git a/trunk/fs/ocfs2/aops.c b/trunk/fs/ocfs2/aops.c index ec8b606b30e1..84bf6e79de23 100644 --- a/trunk/fs/ocfs2/aops.c +++ b/trunk/fs/ocfs2/aops.c @@ -740,18 +740,13 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno, bh = head; block_start = 0; do { - void *kaddr; - block_end = block_start + bsize; if (block_end <= from) goto next_bh; if (block_start >= to) break; - kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr+block_start, 0, bh->b_size); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + zero_user_page(page, block_start, bh->b_size, KM_USER0); set_buffer_uptodate(bh); mark_buffer_dirty(bh); @@ -906,15 +901,11 @@ static void ocfs2_zero_new_buffers(struct page *page, unsigned from, unsigned to if (block_end > from && block_start < to) { if (!PageUptodate(page)) { unsigned start, end; - void *kaddr; start = max(from, block_start); end = min(to, block_end); - kaddr = kmap_atomic(page, KM_USER0); - memset(kaddr+start, 0, end - start); - flush_dcache_page(page); - kunmap_atomic(kaddr, KM_USER0); + zero_user_page(page, start, end - start, KM_USER0); set_buffer_uptodate(bh); }