diff options
| author | Richard Weinberger <richard@nod.at> | 2015-03-04 20:58:39 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-03-26 23:27:53 +0100 |
| commit | af6aa1b9cad7350d675fe3523ab062e0e4c829cb (patch) | |
| tree | 75bb30ea47d2d222b50d7bf5b458ecd3b127a326 | |
| parent | hostfs: Set page flags in hostfs_readpage() correctly (diff) | |
| download | linux-af6aa1b9cad7350d675fe3523ab062e0e4c829cb.tar.xz linux-af6aa1b9cad7350d675fe3523ab062e0e4c829cb.zip | |
hostfs: Use page_offset()
The kernel offers a helper function for that, use it.
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index f1547479e62e..f82f98a517f7 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -410,7 +410,7 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc) struct address_space *mapping = page->mapping; struct inode *inode = mapping->host; char *buffer; - unsigned long long base; + loff_t base = page_offset(page); int count = PAGE_CACHE_SIZE; int end_index = inode->i_size >> PAGE_CACHE_SHIFT; int err; @@ -419,7 +419,6 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc) count = inode->i_size & (PAGE_CACHE_SIZE-1); buffer = kmap(page); - base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT; err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count); if (err != count) { @@ -444,10 +443,9 @@ static int hostfs_writepage(struct page *page, struct writeback_control *wbc) static int hostfs_readpage(struct file *file, struct page *page) { char *buffer; - long long start; + loff_t start = page_offset(page); int bytes_read, ret = 0; - start = (long long) page->index << PAGE_CACHE_SHIFT; buffer = kmap(page); bytes_read = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer, PAGE_CACHE_SIZE); |