X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_internal.h;h=7ceabd5f64679e94d530203681db6eb8c6cb9583;hb=eaf3353fce3384e21b1310c2feb847a7c01eb131;hp=bb5ce79c63b0fb5bb17e16a82281a4eea0db16f6;hpb=d136d6bda8bb59d5055d2f64bef2abe6fbbfceda;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index bb5ce79..7ceabd5 100644
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,7 +47,6 @@
 enum obd_notify_event;
 struct inode;
 struct lustre_md;
-struct obd_capa;
 struct obd_device;
 struct obd_export;
 struct page;
@@ -69,8 +68,8 @@ struct vvp_io {
 	/**
 	 * I/O vector information to or from which read/write is going.
 	 */
-	struct iovec *vui_iov;
-	unsigned long vui_nrsegs;
+	struct iov_iter *vui_iter;
+#ifndef HAVE_FILE_OPERATIONS_READ_WRITE_ITER
 	/**
 	 * Total iov count for left IO.
 	 */
@@ -79,6 +78,7 @@ struct vvp_io {
 	 * Old length for iov that was truncated partially.
 	 */
 	size_t vui_iov_olen;
+#endif /* !HAVE_FILE_OPERATIONS_READ_WRITE_ITER */
 	/**
 	 * Total size for the left IO.
 	 */
@@ -147,7 +147,6 @@ extern struct lu_context_key vvp_thread_key;
 
 extern struct kmem_cache *vvp_lock_kmem;
 extern struct kmem_cache *vvp_object_kmem;
-extern struct kmem_cache *vvp_req_kmem;
 
 struct vvp_thread_info {
 	struct cl_lock		vti_lock;
@@ -269,7 +268,6 @@ static inline pgoff_t vvp_index(struct vvp_page *vpg)
 
 struct vvp_device {
 	struct cl_device    vdv_cl;
-	struct super_block *vdv_sb;
 	struct cl_device   *vdv_next;
 };
 
@@ -277,10 +275,6 @@ struct vvp_lock {
 	struct cl_lock_slice vlk_cl;
 };
 
-struct vvp_req {
-	struct cl_req_slice vrq_cl;
-};
-
 static inline struct lu_device *vvp2lu_dev(struct vvp_device *vdv)
 {
 	return &vdv->vdv_cl.cd_lu_dev;
@@ -347,8 +341,6 @@ int vvp_lock_init(const struct lu_env *env, struct cl_object *obj,
 		  struct cl_lock *lock, const struct cl_io *io);
 int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
 		  struct cl_page *page, pgoff_t index);
-int vvp_req_init(const struct lu_env *env, struct cl_device *dev,
-		 struct cl_req *req);
 struct lu_object *vvp_object_alloc(const struct lu_env *env,
 				   const struct lu_object_header *hdr,
 				   struct lu_device *dev);