LU-4198 clio: turn on lockless for some kind of IO

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

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 21f1764..902a82f 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;
 
@@ -166,11 +168,9 @@ struct osc_session {
 struct osc_thread_info {
        struct ldlm_res_id      oti_resname;
        union ldlm_policy_data  oti_policy;
-       struct cl_lock_descr    oti_descr;
        struct cl_attr          oti_attr;
-       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().
@@ -533,7 +533,11 @@ struct osc_page {
        /**
         * Set if the page must be transferred with OBD_BRW_SRVLOCK.
         */
-                               ops_srvlock:1;
+                               ops_srvlock:1,
+       /**
+        * If the page is in osc_object::oo_tree.
+        */
+                               ops_intree:1;
        /**
         * lru page list. See osc_lru_{del|use}() in osc_page.c for usage.
         */
@@ -562,6 +566,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;
@@ -587,9 +592,9 @@ int osc_set_async_flags(struct osc_object *obj, struct osc_page *opg,
 int osc_prep_async_page(struct osc_object *osc, struct osc_page *ops,
                        struct page *page, loff_t offset);
 int osc_queue_async_io(const struct lu_env *env, struct cl_io *io,
-                      struct osc_page *ops);
-int osc_page_cache_add(const struct lu_env *env,
-                      const struct cl_page_slice *slice, struct cl_io *io);
+                      struct osc_page *ops, cl_commit_cbt cb);
+int osc_page_cache_add(const struct lu_env *env, struct osc_page *opg,
+                      struct cl_io *io, cl_commit_cbt cb);
 int osc_teardown_async_page(const struct lu_env *env, struct osc_object *obj,
                            struct osc_page *ops);
 int osc_flush_async_page(const struct lu_env *env, struct cl_io *io,
@@ -685,9 +690,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,
@@ -718,6 +723,7 @@ void osc_lock_cancel(const struct lu_env *env,
                     const struct cl_lock_slice *slice);
 void osc_lock_fini(const struct lu_env *env, struct cl_lock_slice *slice);
 int osc_ldlm_glimpse_ast(struct ldlm_lock *dlmlock, void *data);
+unsigned long osc_ldlm_weigh_ast(struct ldlm_lock *dlmlock);
 
 /*****************************************************************************
  *
@@ -932,7 +938,9 @@ struct osc_extent {
         * called by page WB daemon, or sync write or reading requests. */
                                oe_urgent:1,
        /** Non-delay RPC should be used for this extent. */
-                               oe_ndelay:1;
+                               oe_ndelay:1,
+       /** direct IO pages */
+                               oe_dio:1;
        /** how many grants allocated for this extent.
         *  Grant allocated for this extent. There is no grant allocated
         *  for reading extents and sync write extents. */
@@ -941,11 +949,6 @@ struct osc_extent {
        unsigned int            oe_nr_pages;
        /** list of pending oap pages. Pages in this list are NOT sorted. */
        struct list_head        oe_pages;
-       /** Since an extent has to be written out in atomic, this is used to
-        * remember the next page need to be locked to write this extent out.
-        * Not used right now.
-        */
-       struct osc_page         *oe_next_page;
        /** start and end index of this extent, include start and end
         * themselves. Page offset here is the page index of osc_pages.
         * oe_start is used as keyword for red-black tree. */