Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60945cb7 authored by Nate Diller's avatar Nate Diller Committed by Trond Myklebust
Browse files

NFS: use zero_user_page 



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

Signed-off-by: default avatarNate Diller <nate.diller@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 550facd1

fs/nfs/read.c

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ void nfs_readdata_release(void *data) 
static

int nfs_return_empty_page(struct page *page)

{

	memclear_highpage_flush(page, 0, PAGE_CACHE_SIZE);

	zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);

	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) {

			memclear_highpage_flush(*pages, base, remainder);

			zero_user_page(*pages, base, remainder, KM_USER0);

			break;

		}

		memclear_highpage_flush(*pages, base, pglen);

		zero_user_page(*pages, base, pglen, KM_USER0);

		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)

		memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);

		zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);



	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) 
			return PTR_ERR(new);

	}

	if (len < PAGE_CACHE_SIZE)

		memclear_highpage_flush(page, len, PAGE_CACHE_SIZE - len);

		zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);

	nfs_pageio_add_request(desc->pgio, new);

	return 0;

}

fs/nfs/write.c

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void nfs_mark_uptodate(struct page *page, unsigned int base, unsigned int 
	if (count != nfs_page_length(page))

		return;

	if (count != PAGE_CACHE_SIZE)

		memclear_highpage_flush(page, count, PAGE_CACHE_SIZE - count);

		zero_user_page(page, count, PAGE_CACHE_SIZE - count, KM_USER0);

	SetPageUptodate(page);

}