Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 60945cb7c8377b727288275f21791914fe65311c

Authored by Nate Diller
Committed by Trond Myklebust
1 parent 550facd138
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

NFS: use zero_user_page 

Use zero_user_page() instead of the newly deprecated memclear_highpage_flush().

Signed-off-by: Nate Diller <nate.diller@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

... ... @@ -79,7 +79,7 @@
79 79 static
80 80 int nfs_return_empty_page(struct page *page)
81 81 {
82   - memclear_highpage_flush(page, 0, PAGE_CACHE_SIZE);
  82 + zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
83 83 SetPageUptodate(page);
84 84 unlock_page(page);
85 85 return 0;
86 86  
... ... @@ -103,10 +103,10 @@
103 103 pglen = PAGE_CACHE_SIZE - base;
104 104 for (;;) {
105 105 if (remainder <= pglen) {
106   - memclear_highpage_flush(*pages, base, remainder);
  106 + zero_user_page(*pages, base, remainder, KM_USER0);
107 107 break;
108 108 }
109   - memclear_highpage_flush(*pages, base, pglen);
  109 + zero_user_page(*pages, base, pglen, KM_USER0);
110 110 pages++;
111 111 remainder -= pglen;
112 112 pglen = PAGE_CACHE_SIZE;
... ... @@ -130,7 +130,7 @@
130 130 return PTR_ERR(new);
131 131 }
132 132 if (len < PAGE_CACHE_SIZE)
133   - memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
  133 + zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);
134 134  
135 135 nfs_list_add_request(new, &one_request);
136 136 if (NFS_SERVER(inode)->rsize < PAGE_CACHE_SIZE)
... ... @@ -532,7 +532,7 @@
532 532 return PTR_ERR(new);
533 533 }
534 534 if (len < PAGE_CACHE_SIZE)
535   - memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);
  535 + zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);
536 536 nfs_pageio_add_request(desc->pgio, new);
537 537 return 0;
538 538 }
... ... @@ -168,7 +168,7 @@
168 168 if (count != nfs_page_length(page))
169 169 return;
170 170 if (count != PAGE_CACHE_SIZE)
171   - memclear_highpage_flush(page, count, PAGE_CACHE_SIZE - count);
  171 + zero_user_page(page, count, PAGE_CACHE_SIZE - count, KM_USER0);
172 172 SetPageUptodate(page);
173 173 }
174 174