LU-12336 build: Update ZFS version to 0.8.1

[fs/lustre-release.git] / lustre / include / lustre_osc.h

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 3fb2d33..d6c2701 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -135,7 +135,9 @@ struct osc_io {
        /** true if this io is lockless. */
        unsigned int       oi_lockless:1,
        /** true if this io is counted as active IO */
-                          oi_is_active:1;
+                          oi_is_active:1,
+       /** true if this io has CAP_SYS_RESOURCE */
+                          oi_cap_sys_resource:1;
        /** how many LRU pages are reserved for this IO */
        unsigned long      oi_lru_reserved;
 
@@ -171,6 +173,7 @@ struct osc_thread_info {
        struct lustre_handle    oti_handle;
        struct cl_page_list     oti_plist;
        struct cl_io            oti_io;
+       struct pagevec          oti_pagevec;
        void                    *oti_pvec[OTI_PVEC_SIZE];
        /**
         * Fields used by cl_lock_discard_pages().
@@ -566,6 +569,7 @@ extern struct kmem_cache *osc_thread_kmem;
 extern struct kmem_cache *osc_session_kmem;
 extern struct kmem_cache *osc_extent_kmem;
 extern struct kmem_cache *osc_quota_kmem;
+extern struct kmem_cache *osc_obdo_kmem;
 
 extern struct lu_context_key osc_key;
 extern struct lu_context_key osc_session_key;
@@ -689,9 +693,9 @@ int osc_io_commit_async(const struct lu_env *env,
 int osc_io_iter_init(const struct lu_env *env, const struct cl_io_slice *ios);
 void osc_io_iter_fini(const struct lu_env *env,
                      const struct cl_io_slice *ios);
-int osc_io_write_iter_init(const struct lu_env *env,
-                          const struct cl_io_slice *ios);
-void osc_io_write_iter_fini(const struct lu_env *env,
+int osc_io_rw_iter_init(const struct lu_env *env,
+                       const struct cl_io_slice *ios);
+void osc_io_rw_iter_fini(const struct lu_env *env,
                            const struct cl_io_slice *ios);
 int osc_io_fault_start(const struct lu_env *env, const struct cl_io_slice *ios);
 void osc_io_setattr_end(const struct lu_env *env,