Pagecache zeroing: zero_user_segment, zero_user_segments and zero_user

Simplify page cache zeroing of segments of pages through 3 functions

zero_user_segments(page, start1, end1, start2, end2)

        Zeros two segments of the page. It takes the position where to
        start and end the zeroing which avoids length calculations and
	makes code clearer.

zero_user_segment(page, start, end)

        Same for a single segment.

zero_user(page, start, length)

        Length variant for the case where we know the length.

We remove the zero_user_page macro. Issues:

1. Its a macro. Inline functions are preferable.

2. The KM_USER0 macro is only defined for HIGHMEM.

   Having to treat this special case everywhere makes the
   code needlessly complex. The parameter for zeroing is always
   KM_USER0 except in one single case that we open code.

Avoiding KM_USER0 makes a lot of code not having to be dealing
with the special casing for HIGHMEM anymore. Dealing with
kmap is only necessary for HIGHMEM configurations. In those
configurations we use KM_USER0 like we do for a series of other
functions defined in highmem.h.

Since KM_USER0 is depends on HIGHMEM the existing zero_user_page
function could not be a macro. zero_user_* functions introduced
here can be be inline because that constant is not used when these
functions are called.

Also extract the flushing of the caches to be outside of the kmap.

[akpm@linux-foundation.org: fix nfs and ntfs build]
[akpm@linux-foundation.org: fix ntfs build some more]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Steven French <sfrench@us.ibm.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: <linux-ext4@vger.kernel.org>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Anton Altaparmakov <aia21@cantab.net>
Cc: Mark Fasheh <mark.fasheh@oracle.com>
Cc: David Chinner <dgc@sgi.com>
Cc: Michael Halcrow <mhalcrow@us.ibm.com>
Cc: Steven French <sfrench@us.ibm.com>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

3 files changed, 27 insertions, 27 deletions

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index ad87cb01299b..00e9ccde8e42 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -87,13 +87,17 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
                 /* Check for the current buffer head overflowing. */
                 if (unlikely(file_ofs + bh->b_size > init_size)) {
                         int ofs;
+                        void *kaddr;
 
                         ofs = 0;
                         if (file_ofs < init_size)
                                 ofs = init_size - file_ofs;
                         local_irq_save(flags);
-                        zero_user_page(page, bh_offset(bh) + ofs,
-                                         bh->b_size - ofs, KM_BIO_SRC_IRQ);
+                        kaddr = kmap_atomic(page, KM_BIO_SRC_IRQ);
+                        memset(kaddr + bh_offset(bh) + ofs, 0,
+                                        bh->b_size - ofs);
+                        flush_dcache_page(page);
+                        kunmap_atomic(kaddr, KM_BIO_SRC_IRQ);
                         local_irq_restore(flags);
                 }
         } else {
@@ -334,7 +338,7 @@ handle_hole:
                 bh->b_blocknr = -1UL;
                 clear_buffer_mapped(bh);
 handle_zblock:
-                zero_user_page(page, i * blocksize, blocksize, KM_USER0);
+                zero_user(page, i * blocksize, blocksize);
                 if (likely(!err))
                         set_buffer_uptodate(bh);
         } while (i++, iblock++, (bh = bh->b_this_page) != head);
@@ -410,7 +414,7 @@ retry_readpage:
         /* Is the page fully outside i_size? (truncate in progress) */
         if (unlikely(page->index >= (i_size + PAGE_CACHE_SIZE - 1) >>
                         PAGE_CACHE_SHIFT)) {
-                zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+                zero_user(page, 0, PAGE_CACHE_SIZE);
                 ntfs_debug("Read outside i_size - truncated?");
                 goto done;
         }
@@ -459,7 +463,7 @@ retry_readpage:
          * ok to ignore the compressed flag here.
          */
         if (unlikely(page->index > 0)) {
-                zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+                zero_user(page, 0, PAGE_CACHE_SIZE);
                 goto done;
         }
         if (!NInoAttr(ni))
@@ -788,8 +792,7 @@ lock_retry_remap:
                 if (err == -ENOENT || lcn == LCN_ENOENT) {
                         bh->b_blocknr = -1;
                         clear_buffer_dirty(bh);
-                        zero_user_page(page, bh_offset(bh), blocksize,
-                                        KM_USER0);
+                        zero_user(page, bh_offset(bh), blocksize);
                         set_buffer_uptodate(bh);
                         err = 0;
                         continue;
@@ -1414,8 +1417,7 @@ retry_writepage:
                 if (page->index >= (i_size >> PAGE_CACHE_SHIFT)) {
                         /* The page straddles i_size. */
                         unsigned int ofs = i_size & ~PAGE_CACHE_MASK;
-                        zero_user_page(page, ofs, PAGE_CACHE_SIZE - ofs,
-                                        KM_USER0);
+                        zero_user_segment(page, ofs, PAGE_CACHE_SIZE);
                 }
                 /* Handle mst protected attributes. */
                 if (NInoMstProtected(ni))
diff --git a/fs/ntfs/compress.c b/fs/ntfs/compress.c
index d1619d05eb23..33ff314cc507 100644
--- a/fs/ntfs/compress.c
+++ b/fs/ntfs/compress.c
@@ -565,7 +565,7 @@ int ntfs_read_compressed_block(struct page *page)
         if (xpage >= max_page) {
                 kfree(bhs);
                 kfree(pages);
-                zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+                zero_user(page, 0, PAGE_CACHE_SIZE);
                 ntfs_debug("Compressed read outside i_size - truncated?");
                 SetPageUptodate(page);
                 unlock_page(page);
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 6cd08dfdc2ed..3c5550cd11d6 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -607,8 +607,8 @@ do_next_page:
                                         ntfs_submit_bh_for_read(bh);
                                         *wait_bh++ = bh;
                                 } else {
-                                        zero_user_page(page, bh_offset(bh),
-                                                        blocksize, KM_USER0);
+                                        zero_user(page, bh_offset(bh),
+                                                        blocksize);
                                         set_buffer_uptodate(bh);
                                 }
                         }
@@ -683,9 +683,8 @@ map_buffer_cached:
                                                 ntfs_submit_bh_for_read(bh);
                                                 *wait_bh++ = bh;
                                         } else {
-                                                zero_user_page(page,
-                                                        bh_offset(bh),
-                                                        blocksize, KM_USER0);
+                                                zero_user(page, bh_offset(bh),
+                                                                blocksize);
                                                 set_buffer_uptodate(bh);
                                         }
                                 }
@@ -703,8 +702,8 @@ map_buffer_cached:
                          */
                         if (bh_end <= pos || bh_pos >= end) {
                                 if (!buffer_uptodate(bh)) {
-                                        zero_user_page(page, bh_offset(bh),
-                                                        blocksize, KM_USER0);
+                                        zero_user(page, bh_offset(bh),
+                                                        blocksize);
                                         set_buffer_uptodate(bh);
                                 }
                                 mark_buffer_dirty(bh);
@@ -743,8 +742,7 @@ map_buffer_cached:
                                 if (!buffer_uptodate(bh))
                                         set_buffer_uptodate(bh);
                         } else if (!buffer_uptodate(bh)) {
-                                zero_user_page(page, bh_offset(bh), blocksize,
-                                                KM_USER0);
+                                zero_user(page, bh_offset(bh), blocksize);
                                 set_buffer_uptodate(bh);
                         }
                         continue;
@@ -868,8 +866,8 @@ rl_not_mapped_enoent:
                                         if (!buffer_uptodate(bh))
                                                 set_buffer_uptodate(bh);
                                 } else if (!buffer_uptodate(bh)) {
-                                        zero_user_page(page, bh_offset(bh),
-                                                        blocksize, KM_USER0);
+                                        zero_user(page, bh_offset(bh),
+                                                blocksize);
                                         set_buffer_uptodate(bh);
                                 }
                                 continue;
@@ -1128,8 +1126,8 @@ rl_not_mapped_enoent:
 
                                 if (likely(bh_pos < initialized_size))
                                         ofs = initialized_size - bh_pos;
-                                zero_user_page(page, bh_offset(bh) + ofs,
-                                                blocksize - ofs, KM_USER0);
+                                zero_user_segment(page, bh_offset(bh) + ofs,
+                                                blocksize);
                         }
                 } else /* if (unlikely(!buffer_uptodate(bh))) */
                         err = -EIO;
@@ -1269,8 +1267,8 @@ rl_not_mapped_enoent:
                                 if (PageUptodate(page))
                                         set_buffer_uptodate(bh);
                                 else {
-                                        zero_user_page(page, bh_offset(bh),
-                                                        blocksize, KM_USER0);
+                                        zero_user(page, bh_offset(bh),
+                                                        blocksize);
                                         set_buffer_uptodate(bh);
                                 }
                         }
@@ -1330,7 +1328,7 @@ err_out:
                 len = PAGE_CACHE_SIZE;
                 if (len > bytes)
                         len = bytes;
-                zero_user_page(*pages, 0, len, KM_USER0);
+                zero_user(*pages, 0, len);
         }
         goto out;
 }
@@ -1451,7 +1449,7 @@ err_out:
                 len = PAGE_CACHE_SIZE;
                 if (len > bytes)
                         len = bytes;
-                zero_user_page(*pages, 0, len, KM_USER0);
+                zero_user(*pages, 0, len);
         }
         goto out;
 }