Commit f639bef5 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'xfs-4.18-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull xfs bugfix from Darrick Wong:
 "One more patch for 4.18 to fix a coding error in the iomap_bmap()
  function introduced in -rc1: fix incorrect shifting"

* tag 'xfs-4.18-fixes-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  fs: fix iomap_bmap position calculation
parents a32e236e 79b3dbe4
...@@ -1443,7 +1443,7 @@ iomap_bmap(struct address_space *mapping, sector_t bno, ...@@ -1443,7 +1443,7 @@ iomap_bmap(struct address_space *mapping, sector_t bno,
const struct iomap_ops *ops) const struct iomap_ops *ops)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
loff_t pos = bno >> inode->i_blkbits; loff_t pos = bno << inode->i_blkbits;
unsigned blocksize = i_blocksize(inode); unsigned blocksize = i_blocksize(inode);
if (filemap_write_and_wait(mapping)) if (filemap_write_and_wait(mapping))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment