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

diff --combined fs/iomap.c
index 009071e73bc0bb46e368f792859d492a93cbd366,8a18163dc432444cbb36f8db4a585e9b0083a256..74762b1ec233f9e9ab1f5da47116271143a344db
--- 1/fs/iomap.c
--- 2/fs/iomap.c
+++ b/fs/iomap.c
@@@ -290,7 -290,7 +290,7 @@@ iomap_readpage_actor(struct inode *inod
        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;
        }
@@@ -2097,7 -2097,7 +2097,7 @@@ iomap_bmap(struct address_space *mappin
                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))