projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'omap-for-v4.11/fixes-rc6-signed' of git://git.kernel.org/pub/scm/linux...
[linux-2.6-block.git]
/
mm
/
truncate.c
diff --git
a/mm/truncate.c
b/mm/truncate.c
index f2db67465495c05ea64d8725e1962b38d541079b..6263affdef8866135f28256b5b1f5e598515d204 100644
(file)
--- a/
mm/truncate.c
+++ b/
mm/truncate.c
@@
-786,7
+786,7
@@
EXPORT_SYMBOL(truncate_setsize);
*/
void pagecache_isize_extended(struct inode *inode, loff_t from, loff_t to)
{
- int bsize =
1 << inode->i_blkbits
;
+ int bsize =
i_blocksize(inode)
;
loff_t rounded_from;
struct page *page;
pgoff_t index;