diff options
-rw-r--r-- | fs/romfs/inode.c | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/fs/romfs/inode.c b/fs/romfs/inode.c index 8e51a2aaa977..60d2f822e87b 100644 --- a/fs/romfs/inode.c +++ b/fs/romfs/inode.c | |||
@@ -418,7 +418,8 @@ static int | |||
418 | romfs_readpage(struct file *file, struct page * page) | 418 | romfs_readpage(struct file *file, struct page * page) |
419 | { | 419 | { |
420 | struct inode *inode = page->mapping->host; | 420 | struct inode *inode = page->mapping->host; |
421 | loff_t offset, avail, readlen; | 421 | loff_t offset, size; |
422 | unsigned long filled; | ||
422 | void *buf; | 423 | void *buf; |
423 | int result = -EIO; | 424 | int result = -EIO; |
424 | 425 | ||
@@ -430,21 +431,29 @@ romfs_readpage(struct file *file, struct page * page) | |||
430 | 431 | ||
431 | /* 32 bit warning -- but not for us :) */ | 432 | /* 32 bit warning -- but not for us :) */ |
432 | offset = page_offset(page); | 433 | offset = page_offset(page); |
433 | if (offset < i_size_read(inode)) { | 434 | size = i_size_read(inode); |
434 | avail = inode->i_size-offset; | 435 | filled = 0; |
435 | readlen = min_t(unsigned long, avail, PAGE_SIZE); | 436 | result = 0; |
436 | if (romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen) == readlen) { | 437 | if (offset < size) { |
437 | if (readlen < PAGE_SIZE) { | 438 | unsigned long readlen; |
438 | memset(buf + readlen,0,PAGE_SIZE-readlen); | 439 | |
439 | } | 440 | size -= offset; |
440 | SetPageUptodate(page); | 441 | readlen = size > PAGE_SIZE ? PAGE_SIZE : size; |
441 | result = 0; | 442 | |
443 | filled = romfs_copyfrom(inode, buf, ROMFS_I(inode)->i_dataoffset+offset, readlen); | ||
444 | |||
445 | if (filled != readlen) { | ||
446 | SetPageError(page); | ||
447 | filled = 0; | ||
448 | result = -EIO; | ||
442 | } | 449 | } |
443 | } | 450 | } |
444 | if (result) { | 451 | |
445 | memset(buf, 0, PAGE_SIZE); | 452 | if (filled < PAGE_SIZE) |
446 | SetPageError(page); | 453 | memset(buf + filled, 0, PAGE_SIZE-filled); |
447 | } | 454 | |
455 | if (!result) | ||
456 | SetPageUptodate(page); | ||
448 | flush_dcache_page(page); | 457 | flush_dcache_page(page); |
449 | 458 | ||
450 | unlock_page(page); | 459 | unlock_page(page); |