kill iov_shorten() (faea1329) · Commits · e / devices / android_kernel_fairphone_FP4

fs/read_write.c

+0 −21

Original line number	Diff line number	Diff line
		@@ -634,27 +634,6 @@ SYSCALL_DEFINE4(pwrite64, unsigned int, fd, const char __user *, buf,
		return ret;
		}

		/*
		* Reduce an iovec's length in-place. Return the resulting number of segments
		*/
		unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to)
		{
		unsigned long seg = 0;
		size_t len = 0;

		while (seg < nr_segs) {
		seg++;
		if (len + iov->iov_len >= to) {
		iov->iov_len = to - len;
		break;
		}
		len += iov->iov_len;
		iov++;
		}
		return seg;
		}
		EXPORT_SYMBOL(iov_shorten);

		static ssize_t do_iter_readv_writev(struct file filp, struct iov_iter iter,
		loff_t *ppos, int type, rwf_t flags)
		{

+0 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ static inline struct iovec iov_iter_iovec(const struct iov_iter *iter)
		((iov = iov_iter_iovec(&(iter))), 1); \
		iov_iter_advance(&(iter), (iov).iov_len))

		unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);

		size_t iov_iter_copy_from_user_atomic(struct page *page,
		struct iov_iter *i, unsigned long offset, size_t bytes);
		void iov_iter_advance(struct iov_iter *i, size_t bytes);