diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-29 03:50:33 -0500 |
| commit | 2226340eb8df9c42f9fca74582d08d5117fc0cec (patch) | |
| tree | c98370844715194600b79f886dbc391633f3e470 /mm/truncate.c | |
| parent | 2e06cb5859fdaeba0529806eb1bf161ffd0db201 (diff) | |
| parent | 624f54be206adf970cd8eece16446b027913e533 (diff) | |
| download | kernel-crypto-2226340eb8df9c42f9fca74582d08d5117fc0cec.tar.gz kernel-crypto-2226340eb8df9c42f9fca74582d08d5117fc0cec.tar.xz kernel-crypto-2226340eb8df9c42f9fca74582d08d5117fc0cec.zip | |
Merge branch 'master'
Diffstat (limited to 'mm/truncate.c')
| -rw-r--r-- | mm/truncate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/truncate.c b/mm/truncate.c index 29c18f68dc3..9173ab50060 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -282,8 +282,8 @@ int invalidate_inode_pages2_range(struct address_space *mapping, * Zap the rest of the file in one hit. */ unmap_mapping_range(mapping, - page_index << PAGE_CACHE_SHIFT, - (end - page_index + 1) + (loff_t)page_index<<PAGE_CACHE_SHIFT, + (loff_t)(end - page_index + 1) << PAGE_CACHE_SHIFT, 0); did_range_unmap = 1; @@ -292,7 +292,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping, * Just zap this page */ unmap_mapping_range(mapping, - page_index << PAGE_CACHE_SHIFT, + (loff_t)page_index<<PAGE_CACHE_SHIFT, PAGE_CACHE_SIZE, 0); } } |