2 files changed, 6 insertions, 8 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 8fd6dfbe1bc3..3d7d9631e125 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -79,7 +79,7 @@ void nfs_readdata_release(void *data)
 static
 int nfs_return_empty_page(struct page *page)
 {
-        zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
+        zero_user(page, 0, PAGE_CACHE_SIZE);
         SetPageUptodate(page);
         unlock_page(page);
         return 0;
@@ -103,10 +103,10 @@ static void nfs_readpage_truncate_uninitialised_page(struct nfs_read_data *data)
         pglen = PAGE_CACHE_SIZE - base;
         for (;;) {
                 if (remainder <= pglen) {
-                        zero_user_page(*pages, base, remainder, KM_USER0);
+                        zero_user(*pages, base, remainder);
                         break;
                 }
-                zero_user_page(*pages, base, pglen, KM_USER0);
+                zero_user(*pages, base, pglen);
                 pages++;
                 remainder -= pglen;
                 pglen = PAGE_CACHE_SIZE;
@@ -130,7 +130,7 @@ static int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
                 return PTR_ERR(new);
         }
         if (len < PAGE_CACHE_SIZE)
-                zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);
+                zero_user_segment(page, len, PAGE_CACHE_SIZE);
 
         nfs_list_add_request(new, &one_request);
         if (NFS_SERVER(inode)->rsize < PAGE_CACHE_SIZE)
@@ -532,7 +532,7 @@ readpage_async_filler(void *data, struct page *page)
                 goto out_error;
 
         if (len < PAGE_CACHE_SIZE)
-                zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);
+                zero_user_segment(page, len, PAGE_CACHE_SIZE);
         nfs_pageio_add_request(desc->pgio, new);
         return 0;
 out_error:
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 522efff3e2c5..b144b1957dd9 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -665,9 +665,7 @@ zero_page:
          * then we need to zero any uninitalised data. */
         if (req->wb_pgbase == 0 && req->wb_bytes != PAGE_CACHE_SIZE
                         && !PageUptodate(req->wb_page))
-                zero_user_page(req->wb_page, req->wb_bytes,
-                                PAGE_CACHE_SIZE - req->wb_bytes,
-                                KM_USER0);
+                zero_user_segment(req->wb_page, req->wb_bytes, PAGE_CACHE_SIZE);
         return req;
 }