diff options
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index d1abbee281d1..7016653f3e41 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
@@ -410,12 +410,12 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc) | |||
410 | struct inode *inode = mapping->host; | 410 | struct inode *inode = mapping->host; |
411 | char *buffer; | 411 | char *buffer; |
412 | loff_t base = page_offset(page); | 412 | loff_t base = page_offset(page); |
413 | int count = PAGE_CACHE_SIZE; | 413 | int count = PAGE_SIZE; |
414 | int end_index = inode->i_size >> PAGE_CACHE_SHIFT; | 414 | int end_index = inode->i_size >> PAGE_SHIFT; |
415 | int err; | 415 | int err; |
416 | 416 | ||
417 | if (page->index >= end_index) | 417 | if (page->index >= end_index) |
418 | count = inode->i_size & (PAGE_CACHE_SIZE-1); | 418 | count = inode->i_size & (PAGE_SIZE-1); |
419 | 419 | ||
420 | buffer = kmap(page); | 420 | buffer = kmap(page); |
421 | 421 | ||
@@ -447,7 +447,7 @@ static int hostfs_readpage(struct file *file, struct page *page) | |||
447 | 447 | ||
448 | buffer = kmap(page); | 448 | buffer = kmap(page); |
449 | bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer, | 449 | bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer, |
450 | PAGE_CACHE_SIZE); | 450 | PAGE_SIZE); |
451 | if (bytes_read < 0) { | 451 | if (bytes_read < 0) { |
452 | ClearPageUptodate(page); | 452 | ClearPageUptodate(page); |
453 | SetPageError(page); | 453 | SetPageError(page); |
@@ -455,7 +455,7 @@ static int hostfs_readpage(struct file *file, struct page *page) | |||
455 | goto out; | 455 | goto out; |
456 | } | 456 | } |
457 | 457 | ||
458 | memset(buffer + bytes_read, 0, PAGE_CACHE_SIZE - bytes_read); | 458 | memset(buffer + bytes_read, 0, PAGE_SIZE - bytes_read); |
459 | 459 | ||
460 | ClearPageError(page); | 460 | ClearPageError(page); |
461 | SetPageUptodate(page); | 461 | SetPageUptodate(page); |
@@ -471,7 +471,7 @@ static int hostfs_write_begin(struct file *file, struct address_space *mapping, | |||
471 | loff_t pos, unsigned len, unsigned flags, | 471 | loff_t pos, unsigned len, unsigned flags, |
472 | struct page **pagep, void **fsdata) | 472 | struct page **pagep, void **fsdata) |
473 | { | 473 | { |
474 | pgoff_t index = pos >> PAGE_CACHE_SHIFT; | 474 | pgoff_t index = pos >> PAGE_SHIFT; |
475 | 475 | ||
476 | *pagep = grab_cache_page_write_begin(mapping, index, flags); | 476 | *pagep = grab_cache_page_write_begin(mapping, index, flags); |
477 | if (!*pagep) | 477 | if (!*pagep) |
@@ -485,14 +485,14 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping, | |||
485 | { | 485 | { |
486 | struct inode *inode = mapping->host; | 486 | struct inode *inode = mapping->host; |
487 | void *buffer; | 487 | void *buffer; |
488 | unsigned from = pos & (PAGE_CACHE_SIZE - 1); | 488 | unsigned from = pos & (PAGE_SIZE - 1); |
489 | int err; | 489 | int err; |
490 | 490 | ||
491 | buffer = kmap(page); | 491 | buffer = kmap(page); |
492 | err = write_file(FILE_HOSTFS_I(file)->fd, &pos, buffer + from, copied); | 492 | err = write_file(FILE_HOSTFS_I(file)->fd, &pos, buffer + from, copied); |
493 | kunmap(page); | 493 | kunmap(page); |
494 | 494 | ||
495 | if (!PageUptodate(page) && err == PAGE_CACHE_SIZE) | 495 | if (!PageUptodate(page) && err == PAGE_SIZE) |
496 | SetPageUptodate(page); | 496 | SetPageUptodate(page); |
497 | 497 | ||
498 | /* | 498 | /* |
@@ -502,7 +502,7 @@ static int hostfs_write_end(struct file *file, struct address_space *mapping, | |||
502 | if (err > 0 && (pos > inode->i_size)) | 502 | if (err > 0 && (pos > inode->i_size)) |
503 | inode->i_size = pos; | 503 | inode->i_size = pos; |
504 | unlock_page(page); | 504 | unlock_page(page); |
505 | page_cache_release(page); | 505 | put_page(page); |
506 | 506 | ||
507 | return err; | 507 | return err; |
508 | } | 508 | } |