diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:07:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 11:07:23 -0700 |
| commit | df760137ad3cbfa15ceed42478f81bff01b6e799 (patch) | |
| tree | be939c9d11094858d74141a4c62cb23f477754d8 /fs/ceph/file.c | |
| parent | 754b8e653412106ff613f4750b197f807fcd8347 (diff) | |
| parent | de997718b64df2f766736f23f8557da450b83a25 (diff) | |
Merge branch 'omap-boards' into omap-for-linus
Diffstat (limited to 'fs/ceph/file.c')
| -rw-r--r-- | fs/ceph/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 4add3d5da2c..ed6f19721d6 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -665,7 +665,8 @@ more: * throw out any page cache pages in this range. this * may block. */ - truncate_inode_pages_range(inode->i_mapping, pos, pos+len); + truncate_inode_pages_range(inode->i_mapping, pos, + (pos+len) | (PAGE_CACHE_SIZE-1)); } else { pages = alloc_page_vector(num_pages); if (IS_ERR(pages)) { |