Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index 0046d72efe94667619b8d6016abb087364ceb8d6..f8547b82dfb36e6e0a39fb91520addbc4b5a2d75 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -635,27 +635,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)
 {