1 files changed, 6 insertions, 3 deletions

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 4684eb7d48c6..b3ad0bd0312f 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -501,11 +501,16 @@ int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
         long long start;
         int err = 0;
 
-        start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
+        start = (((long long) page->index) << PAGE_CACHE_SHIFT) + from;
         buffer = kmap(page);
         err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from,
                          to - from);
         if(err > 0) err = 0;
+
+        /* Actually, if !err, write_file has added to-from to start, so, despite
+         * the appearance, we are comparing i_size against the _last_ written
+         * location, as we should. */
+
         if(!err && (start > inode->i_size))
                 inode->i_size = start;
 
@@ -910,10 +915,8 @@ static struct inode_operations hostfs_dir_iops = {
 int hostfs_link_readpage(struct file *file, struct page *page)
 {
         char *buffer, *name;
-        long long start;
         int err;
 
-        start = page->index << PAGE_CACHE_SHIFT;
         buffer = kmap(page);
         name = inode_name(page->mapping->host, 0);
         if(name == NULL) return(-ENOMEM);