Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / staging / lustre / lustre / llite / vvp_internal.h

diff --git a/drivers/staging/lustre/lustre/llite/vvp_internal.h b/drivers/staging/lustre/lustre/llite/vvp_internal.h
index 5802da8..4464ad2 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/vvp_internal.h
+++ b/drivers/staging/lustre/lustre/llite/vvp_internal.h
@@ -49,14 +49,6 @@ struct obd_device;
 struct obd_export;
 struct page;
 
-/* specific architecture can implement only part of this list */
-enum vvp_io_subtype {
-       /** normal IO */
-       IO_NORMAL,
-       /** io started from splice_{read|write} */
-       IO_SPLICE
-};
-
 /**
  * IO state private to IO state private to VVP layer.
  */
@@ -98,10 +90,6 @@ struct vvp_io {
                         */
                        bool            ft_flags_valid;
                } fault;
-               struct {
-                       struct pipe_inode_info  *vui_pipe;
-                       unsigned int             vui_flags;
-               } splice;
                struct {
                        struct cl_page_list vui_queue;
                        unsigned long vui_written;
@@ -110,8 +98,6 @@ struct vvp_io {
                } write;
        } u;
 
-       enum vvp_io_subtype     vui_io_subtype;
-
        /**
         * Layout version when this IO is initialized
         */