kill iov_shorten()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/read_write.c b/fs/read_write.c
index f0d4b16873e89aa23522c9ece34b8f1900638176..b8bf2cb3298aa3e4bd6840de9885990f458e8e4a 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -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)
 {

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 8a642cda641c85c82f823979709ab3157dc28d4b..5885daeae72145aad91946a9caa68153cd576ed5 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -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);