iov_iter: Kill ITER_PIPE

[linux-2.6-microblaze.git] / include / linux / uio.h

diff --git a/include/linux/uio.h b/include/linux/uio.h
index 044c1d8..60c342b 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -11,7 +11,6 @@
 #include <uapi/linux/uio.h>
 
 struct page;
-struct pipe_inode_info;
 
 typedef unsigned int __bitwise iov_iter_extraction_t;
 
@@ -25,7 +24,6 @@ enum iter_type {
        ITER_IOVEC,
        ITER_KVEC,
        ITER_BVEC,
-       ITER_PIPE,
        ITER_XARRAY,
        ITER_DISCARD,
        ITER_UBUF,
@@ -74,7 +72,6 @@ struct iov_iter {
                                const struct kvec *kvec;
                                const struct bio_vec *bvec;
                                struct xarray *xarray;
-                               struct pipe_inode_info *pipe;
                                void __user *ubuf;
                        };
                        size_t count;
@@ -82,10 +79,6 @@ struct iov_iter {
        };
        union {
                unsigned long nr_segs;
-               struct {
-                       unsigned int head;
-                       unsigned int start_head;
-               };
                loff_t xarray_start;
        };
 };
@@ -133,11 +126,6 @@ static inline bool iov_iter_is_bvec(const struct iov_iter *i)
        return iov_iter_type(i) == ITER_BVEC;
 }
 
-static inline bool iov_iter_is_pipe(const struct iov_iter *i)
-{
-       return iov_iter_type(i) == ITER_PIPE;
-}
-
 static inline bool iov_iter_is_discard(const struct iov_iter *i)
 {
        return iov_iter_type(i) == ITER_DISCARD;
@@ -286,8 +274,6 @@ void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struct kvec
                        unsigned long nr_segs, size_t count);
 void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec,
                        unsigned long nr_segs, size_t count);
-void iov_iter_pipe(struct iov_iter *i, unsigned int direction, struct pipe_inode_info *pipe,
-                       size_t count);
 void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);
 void iov_iter_xarray(struct iov_iter *i, unsigned int direction, struct xarray *xarray,
                     loff_t start, size_t count);