6 files changed, 11 insertions, 15 deletions

diff --git a/fs/iomap.c b/fs/iomap.c
index 3ffb776fbebe..d6bc98ae8d35 100644
--- a/fs/iomap.c
+++ b/fs/iomap.c
@@ -1877,15 +1877,6 @@ iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                                 dio->wait_for_completion = true;
                                 ret = 0;
                         }
-
-                        /*
-                         * Splicing to pipes can fail on a full pipe. We have to
-                         * swallow this to make it look like a short IO
-                         * otherwise the higher splice layers will completely
-                         * mishandle the error and stop moving data.
-                         */
-                        if (ret == -EFAULT)
-                                ret = 0;
                         break;
                 }
                 pos += ret;
diff --git a/fs/read_write.c b/fs/read_write.c
index 4dae0399c75a..58f30537c47a 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1956,7 +1956,7 @@ loff_t do_clone_file_range(struct file *file_in, loff_t pos_in,
         struct inode *inode_out = file_inode(file_out);
         loff_t ret;
 
-        WARN_ON_ONCE(remap_flags);
+        WARN_ON_ONCE(remap_flags & REMAP_FILE_DEDUP);
 
         if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))
                 return -EISDIR;
diff --git a/fs/splice.c b/fs/splice.c
index 3553f1956508..de2ede048473 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -945,11 +945,16 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
         sd->flags &= ~SPLICE_F_NONBLOCK;
         more = sd->flags & SPLICE_F_MORE;
 
+        WARN_ON_ONCE(pipe->nrbufs != 0);
+
         while (len) {
                 size_t read_len;
                 loff_t pos = sd->pos, prev_pos = pos;
 
-                ret = do_splice_to(in, &pos, pipe, len, flags);
+                /* Don't try to read more the pipe has space for. */
+                read_len = min_t(size_t, len,
+                                 (pipe->buffers - pipe->nrbufs) << PAGE_SHIFT);
+                ret = do_splice_to(in, &pos, pipe, read_len, flags);
                 if (unlikely(ret <= 0))
                         goto out_release;
 
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;
         }
 }