1 files changed, 7 insertions, 6 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 0e87401cf335..9196f2a270da 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/sched/signal.h>
 #include <linux/syscalls.h>
 #include <linux/fs.h>
 #include <linux/iomap.h>
@@ -2395,7 +2396,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
                             loff_t pos, loff_t *bytes)
 {
         struct inode *inode = mapping->host;
-        unsigned blocksize = 1 << inode->i_blkbits;
+        unsigned int blocksize = i_blocksize(inode);
         struct page *page;
         void *fsdata;
         pgoff_t index, curidx;
@@ -2475,8 +2476,8 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
                         get_block_t *get_block, loff_t *bytes)
 {
         struct inode *inode = mapping->host;
-        unsigned blocksize = 1 << inode->i_blkbits;
-        unsigned zerofrom;
+        unsigned int blocksize = i_blocksize(inode);
+        unsigned int zerofrom;
         int err;
 
         err = cont_expand_zero(file, mapping, pos, bytes);
@@ -2838,7 +2839,7 @@ int nobh_truncate_page(struct address_space *mapping,
         struct buffer_head map_bh;
         int err;
 
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         length = offset & (blocksize - 1);
 
         /* Block boundary? Nothing to do */
@@ -2916,7 +2917,7 @@ int block_truncate_page(struct address_space *mapping,
         struct buffer_head *bh;
         int err;
 
-        blocksize = 1 << inode->i_blkbits;
+        blocksize = i_blocksize(inode);
         length = offset & (blocksize - 1);
 
         /* Block boundary? Nothing to do */
@@ -3028,7 +3029,7 @@ sector_t generic_block_bmap(struct address_space *mapping, sector_t block,
         struct inode *inode = mapping->host;
         tmp.b_state = 0;
         tmp.b_blocknr = 0;
-        tmp.b_size = 1 << inode->i_blkbits;
+        tmp.b_size = i_blocksize(inode);
         get_block(inode, block, &tmp, 0);
         return tmp.b_blocknr;
 }