diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-24 14:15:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-12-24 14:15:58 +1100 |
| commit | c2ecc4f9ee1b4a30eb97b8aacde6b4eb9482ae38 (patch) | |
| tree | 6c1b1576ef043ecf82c07062a287c5788a8f03de /fs/ocfs2/aops.c | |
| parent | d59b405e2f21546455ca9d54303603e9af834a06 (diff) | |
| parent | 1971011670b70fd95fd243bed5befa2edb330320 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'fs/ocfs2/aops.c')
| -rw-r--r-- | fs/ocfs2/aops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 11556b7d93ec..88a31e9340a0 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c @@ -608,7 +608,7 @@ int ocfs2_map_page_blocks(struct page *page, u64 *p_blkno, int ret = 0; struct buffer_head *head, *bh, *wait[2], **wait_bh = wait; unsigned int block_end, block_start; - unsigned int bsize = 1 << inode->i_blkbits; + unsigned int bsize = i_blocksize(inode); if (!page_has_buffers(page)) create_empty_buffers(page, bsize, 0); |