3 files changed, 4 insertions, 4 deletions

diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
index 34c6d7bd4d18..bbdae2b4559f 100644
--- a/fs/xfs/libxfs/xfs_btree.c
+++ b/fs/xfs/libxfs/xfs_btree.c
@@ -330,7 +330,7 @@ xfs_btree_sblock_verify_crc(
 
         if (xfs_sb_version_hascrc(&mp->m_sb)) {
                 if (!xfs_log_check_lsn(mp, be64_to_cpu(block->bb_u.s.bb_lsn)))
-                        return __this_address;
+                        return false;
                 return xfs_buf_verify_cksum(bp, XFS_BTREE_SBLOCK_CRC_OFF);
         }
 
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
index 404e581f1ea1..1ee8c5539fa4 100644
--- a/fs/xfs/xfs_bmap_util.c
+++ b/fs/xfs/xfs_bmap_util.c
@@ -1126,9 +1126,9 @@ xfs_free_file_space(
          * page could be mmap'd and iomap_zero_range doesn't do that for us.
          * Writeback of the eof page will do this, albeit clumsily.
          */
-        if (offset + len >= XFS_ISIZE(ip) && ((offset + len) & PAGE_MASK)) {
+        if (offset + len >= XFS_ISIZE(ip) && offset_in_page(offset + len) > 0) {
                 error = filemap_write_and_wait_range(VFS_I(ip)->i_mapping,
-                                (offset + len) & ~PAGE_MASK, LLONG_MAX);
+                                round_down(offset + len, PAGE_SIZE), LLONG_MAX);
         }
 
         return error;
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c
index 73a1d77ec187..3091e4bc04ef 100644
--- a/fs/xfs/xfs_qm_bhv.c
+++ b/fs/xfs/xfs_qm_bhv.c
@@ -40,7 +40,7 @@ xfs_fill_statvfs_from_dquot(
                 statp->f_files = limit;
                 statp->f_ffree =
                         (statp->f_files > dqp->q_res_icount) ?
-                         (statp->f_ffree - dqp->q_res_icount) : 0;
+                         (statp->f_files - dqp->q_res_icount) : 0;
         }
 }