LU-8066 obdclass: don't copy ops structures in to new type.

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

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 32a2c63..bcd6b85 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -168,10 +168,7 @@ 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];
@@ -595,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,
@@ -693,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,
@@ -950,11 +947,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. */