Commit f8524776 authored by Namjae Jeon's avatar Namjae Jeon
Browse files

ksmbd: remove ksmbd_vfs_copy_file_range 



vfs_copy_file_range and cifs client already does this type of fallback,
so this is dead code.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNamjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent afa8f016

fs/cifsd/smb2pdu.c

+2 −2
Original line number Diff line number Diff line
@@ -7437,8 +7437,8 @@ int smb2_ioctl(struct ksmbd_work *work) 
			ret = -EOPNOTSUPP;

			goto dup_ext_out;

		} else if (cloned != length) {

			cloned = ksmbd_vfs_copy_file_range(fp_in->filp, src_off,

							   fp_out->filp, dst_off, length);

			cloned = vfs_copy_file_range(fp_in->filp, src_off,

						     fp_out->filp, dst_off, length, 0);

			if (cloned != length) {

				if (cloned < 0)

					ret = cloned;

fs/cifsd/vfs.c

+2 −48
Original line number Diff line number Diff line
@@ -1802,52 +1802,6 @@ int ksmbd_vfs_xattr_stream_name(char *stream_name, char **xattr_stream_name, 
	return 0;

}



int ksmbd_vfs_copy_file_range(struct file *file_in, loff_t pos_in,

			      struct file *file_out, loff_t pos_out, size_t len)

{

	struct inode *inode_in = file_inode(file_in);

	struct inode *inode_out = file_inode(file_out);

	int ret;



	ret = vfs_copy_file_range(file_in, pos_in, file_out, pos_out, len, 0);

	/* do splice for the copy between different file systems */

	if (ret != -EXDEV)

		return ret;



	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))

		return -EINVAL;



	if (!(file_in->f_mode & FMODE_READ) ||

	    !(file_out->f_mode & FMODE_WRITE))

		return -EBADF;



	if (len == 0)

		return 0;



	file_start_write(file_out);



	/*

	 * skip the verification of the range of data. it will be done

	 * in do_splice_direct

	 */

	ret = do_splice_direct(file_in, &pos_in, file_out, &pos_out,

			       len > MAX_RW_COUNT ? MAX_RW_COUNT : len, 0);

	if (ret > 0) {

		fsnotify_access(file_in);

		add_rchar(current, ret);

		fsnotify_modify(file_out);

		add_wchar(current, ret);

	}



	inc_syscr(current);

	inc_syscw(current);



	file_end_write(file_out);

	return ret;

}



int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work,

			       struct ksmbd_file *src_fp,

			       struct ksmbd_file *dst_fp,
@@ -1905,8 +1859,8 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, 
		if (src_off + len > src_file_size)

			return -E2BIG;



		ret = ksmbd_vfs_copy_file_range(src_fp->filp, src_off,

						dst_fp->filp, dst_off, len);

		ret = vfs_copy_file_range(src_fp->filp, src_off,

					  dst_fp->filp, dst_off, len, 0);

		if (ret < 0)

			return ret;

fs/cifsd/vfs.h

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ int ksmbd_vfs_copy_file_ranges(struct ksmbd_work *work, 
			       unsigned int *chunk_count_written,

			       unsigned int *chunk_size_written,

			       loff_t  *total_size_written);

int ksmbd_vfs_copy_file_range(struct file *file_in, loff_t pos_in,

			      struct file *file_out, loff_t pos_out,

			      size_t len);

ssize_t ksmbd_vfs_listxattr(struct dentry *dentry, char **list);

ssize_t ksmbd_vfs_getxattr(struct dentry *dentry, char *xattr_name,

			   char **xattr_buf);