diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-04 18:30:58 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-04 18:30:58 -0700 |
commit | f639bef55d2bf4847d98f45087e1a5874e2320e8 (patch) | |
tree | 5bc9925c7325ce48b1297dbe3b8233506a3fbd09 /fs | |
parent | Partially revert "block: fail op_is_write() requests to read-only partitions" (diff) | |
parent | fs: fix iomap_bmap position calculation (diff) | |
download | linux-dev-f639bef55d2bf4847d98f45087e1a5874e2320e8.tar.xz linux-dev-f639bef55d2bf4847d98f45087e1a5874e2320e8.zip |
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
Diffstat (limited to 'fs')
-rw-r--r-- | fs/iomap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/iomap.c b/fs/iomap.c index 77397b5a96ef..0d0bd8845586 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -1443,7 +1443,7 @@ iomap_bmap(struct address_space *mapping, sector_t bno, const struct iomap_ops *ops) { struct inode *inode = mapping->host; - loff_t pos = bno >> inode->i_blkbits; + loff_t pos = bno << inode->i_blkbits; unsigned blocksize = i_blocksize(inode); if (filemap_write_and_wait(mapping)) |