fs/read_write: Enable copy_file_range for block device.

This is a prep patch. Allow copy_file_range to work for block devices. Relaxing generic_copy_file_checks allows us to reuse the existing infra, instead of adding a new user interface for block copy offload. Change generic_copy_file_checks to use ->f_mapping->host for both inode_in and inode_out. Allow block device in generic_file_rw_checks. Reviewed-by: Hannes Reinecke <[email protected]> Signed-off-by: Anuj Gupta <[email protected]> Signed-off-by: Nitesh Shetty <[email protected]>
truenas · Jul 5, 2024 · 1c6ab05 · 1c6ab05
1 parent fa32bb8
commit 1c6ab05
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/fs/read_write.c b/fs/read_write.c
@@ -1405,8 +1405,8 @@ static int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
  struct file *file_out, loff_t pos_out,
  size_t *req_count, unsigned int flags)
 {
- struct inode *inode_in = file_inode(file_in);
- struct inode *inode_out = file_inode(file_out);
+ struct inode *inode_in = file_in->f_mapping->host;
+ struct inode *inode_out = file_out->f_mapping->host;
  uint64_t count = *req_count;
  loff_t size_in;
  int ret;
@@ -1708,7 +1708,9 @@ int generic_file_rw_checks(struct file *file_in, struct file *file_out)
  /* Don't copy dirs, pipes, sockets... */
  if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))
  return -EISDIR;
- if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))
+ if (!S_ISREG(inode_in->i_mode) && !S_ISBLK(inode_in->i_mode))
+ return -EINVAL;
+ if ((inode_in->i_mode & S_IFMT) != (inode_out->i_mode & S_IFMT))
  return -EINVAL;
 
  if (!(file_in->f_mode & FMODE_READ) ||