diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 03:15:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-22 03:15:47 +0200 |
| commit | c22fc16d172fba4d19ffd8f2aa8fe67edba63895 (patch) | |
| tree | d88b1becfcf2cdccfe0c9429da0c9a998b879d3c /fs/iomap.c | |
| parent | Merge tag 'for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/li... (diff) | |
| parent | iomap: fix WARN_ON_ONCE on uninitialized variable (diff) | |
| download | linux-c22fc16d172fba4d19ffd8f2aa8fe67edba63895.tar.xz linux-c22fc16d172fba4d19ffd8f2aa8fe67edba63895.zip | |
Merge tag 'xfs-4.19-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
- Fix an uninitialized variable
- Don't use obviously garbage AG header counters to calculate
transaction reservations
- Trigger icount recalculation on bad icount when mounting
* tag 'xfs-4.19-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
iomap: fix WARN_ON_ONCE on uninitialized variable
xfs: sanity check ag header values in xrep_calc_ag_resblks
xfs: recalculate summary counters at mount time if icount is bad
Diffstat (limited to 'fs/iomap.c')
| -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 009071e73bc0..74762b1ec233 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -290,7 +290,7 @@ iomap_readpage_actor(struct inode *inode, loff_t pos, loff_t length, void *data, sector_t sector; if (iomap->type == IOMAP_INLINE) { - WARN_ON_ONCE(poff); + WARN_ON_ONCE(pos); iomap_read_inline_data(inode, page, iomap); return PAGE_SIZE; } |