diff options
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r-- | fs/nfs/read.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index eb31e23e7def..6776d7a7839e 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -46,7 +46,7 @@ static void nfs_readhdr_free(struct nfs_pgio_header *rhdr) | |||
46 | static | 46 | static |
47 | int nfs_return_empty_page(struct page *page) | 47 | int nfs_return_empty_page(struct page *page) |
48 | { | 48 | { |
49 | zero_user(page, 0, PAGE_CACHE_SIZE); | 49 | zero_user(page, 0, PAGE_SIZE); |
50 | SetPageUptodate(page); | 50 | SetPageUptodate(page); |
51 | unlock_page(page); | 51 | unlock_page(page); |
52 | return 0; | 52 | return 0; |
@@ -118,8 +118,8 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode, | |||
118 | unlock_page(page); | 118 | unlock_page(page); |
119 | return PTR_ERR(new); | 119 | return PTR_ERR(new); |
120 | } | 120 | } |
121 | if (len < PAGE_CACHE_SIZE) | 121 | if (len < PAGE_SIZE) |
122 | zero_user_segment(page, len, PAGE_CACHE_SIZE); | 122 | zero_user_segment(page, len, PAGE_SIZE); |
123 | 123 | ||
124 | nfs_pageio_init_read(&pgio, inode, false, | 124 | nfs_pageio_init_read(&pgio, inode, false, |
125 | &nfs_async_read_completion_ops); | 125 | &nfs_async_read_completion_ops); |
@@ -295,7 +295,7 @@ int nfs_readpage(struct file *file, struct page *page) | |||
295 | int error; | 295 | int error; |
296 | 296 | ||
297 | dprintk("NFS: nfs_readpage (%p %ld@%lu)\n", | 297 | dprintk("NFS: nfs_readpage (%p %ld@%lu)\n", |
298 | page, PAGE_CACHE_SIZE, page_file_index(page)); | 298 | page, PAGE_SIZE, page_file_index(page)); |
299 | nfs_inc_stats(inode, NFSIOS_VFSREADPAGE); | 299 | nfs_inc_stats(inode, NFSIOS_VFSREADPAGE); |
300 | nfs_add_stats(inode, NFSIOS_READPAGES, 1); | 300 | nfs_add_stats(inode, NFSIOS_READPAGES, 1); |
301 | 301 | ||
@@ -361,8 +361,8 @@ readpage_async_filler(void *data, struct page *page) | |||
361 | if (IS_ERR(new)) | 361 | if (IS_ERR(new)) |
362 | goto out_error; | 362 | goto out_error; |
363 | 363 | ||
364 | if (len < PAGE_CACHE_SIZE) | 364 | if (len < PAGE_SIZE) |
365 | zero_user_segment(page, len, PAGE_CACHE_SIZE); | 365 | zero_user_segment(page, len, PAGE_SIZE); |
366 | if (!nfs_pageio_add_request(desc->pgio, new)) { | 366 | if (!nfs_pageio_add_request(desc->pgio, new)) { |
367 | nfs_list_remove_request(new); | 367 | nfs_list_remove_request(new); |
368 | nfs_readpage_release(new); | 368 | nfs_readpage_release(new); |
@@ -424,8 +424,8 @@ int nfs_readpages(struct file *filp, struct address_space *mapping, | |||
424 | 424 | ||
425 | pgm = &pgio.pg_mirrors[0]; | 425 | pgm = &pgio.pg_mirrors[0]; |
426 | NFS_I(inode)->read_io += pgm->pg_bytes_written; | 426 | NFS_I(inode)->read_io += pgm->pg_bytes_written; |
427 | npages = (pgm->pg_bytes_written + PAGE_CACHE_SIZE - 1) >> | 427 | npages = (pgm->pg_bytes_written + PAGE_SIZE - 1) >> |
428 | PAGE_CACHE_SHIFT; | 428 | PAGE_SHIFT; |
429 | nfs_add_stats(inode, NFSIOS_READPAGES, npages); | 429 | nfs_add_stats(inode, NFSIOS_READPAGES, npages); |
430 | read_complete: | 430 | read_complete: |
431 | put_nfs_open_context(desc.ctx); | 431 | put_nfs_open_context(desc.ctx); |