LU-6017 obd: remove destroy cookie handling

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

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index f83454f..f82f3d1 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -213,7 +213,6 @@ enum {
  * on the MDS.
  */
 #define OBD_MAX_DEFAULT_EA_SIZE                4096
-#define OBD_MAX_DEFAULT_COOKIE_SIZE    4096
 
 struct mdc_rpc_lock;
 struct obd_import;
@@ -223,7 +222,7 @@ struct client_obd {
        struct obd_import       *cl_import; /* ptlrpc connection state */
        size_t                   cl_conn_count;
 
-       /* Cache maximum and default values for easize and cookiesize. This is
+       /* Cache maximum and default values for easize. This is
         * strictly a performance optimization to minimize calls to
         * obd_size_diskmd(). The default values are used to calculate the
         * initial size of a request buffer. The ptlrpc layer will resize the
@@ -243,18 +242,6 @@ struct client_obd {
         * run-time if a larger observed size is advertised by the MDT. */
        __u32                    cl_max_mds_easize;
 
-       /* Default cookie size for llog cookies (see struct llog_cookie). It is
-        * initialized to zero at mount-time, then it tracks the largest
-        * observed cookie size advertised by the MDT, up to a maximum value of
-        * OBD_MAX_DEFAULT_COOKIE_SIZE. Note that llog_cookies are not
-        * used by clients communicating with MDS versions 2.4.0 and later.*/
-       __u32                    cl_default_mds_cookiesize;
-
-       /* Maximum possible cookie size computed at mount-time based on
-        * the number of OSTs in the filesystem. May be increased at
-        * run-time if a larger observed size is advertised by the MDT. */
-       __u32                    cl_max_mds_cookiesize;
-
        enum lustre_sec_part     cl_sp_me;
        enum lustre_sec_part     cl_sp_to;
        struct sptlrpc_flavor    cl_flvr_mgc; /* fixed flavor of mgc->mgs */
@@ -457,8 +444,6 @@ struct lmv_obd {
        int                     connected;
        int                     max_easize;
        int                     max_def_easize;
-       int                     max_cookiesize;
-       int                     max_def_cookiesize;
 
        __u32                   tgts_size; /* size of tgts array */
        struct lmv_tgt_desc     **tgts;
@@ -511,21 +496,6 @@ struct niobuf_local {
 #define LUSTRE_MGS_OBDNAME "MGS"
 #define LUSTRE_MGC_OBDNAME "MGC"
 
-struct obd_trans_info {
-       __u64                    oti_xid;
-       /* Only used on the server side for tracking acks. */
-       struct oti_req_ack_lock {
-               struct lustre_handle    lock;
-               __u32                   mode;
-       }                        oti_ack_locks[4];
-       void                    *oti_handle;
-       struct llog_cookie       oti_onecookie;
-       struct llog_cookie      *oti_logcookies;
-
-       /** VBR: versions */
-       __u64                    oti_pre_version;
-};
-
 /*
  * Events signalled through obd_notify() upcall-chain.
  */
@@ -757,8 +727,6 @@ enum obd_cleanup_stage {
 #define KEY_LOVDESC             "lovdesc"
 #define KEY_MAX_EASIZE         "max_easize"
 #define KEY_DEFAULT_EASIZE     "default_easize"
-#define KEY_MAX_COOKIESIZE     "max_cookiesize"
-#define KEY_DEFAULT_COOKIESIZE "default_cookiesize"
 #define KEY_MGSSEC              "mgssec"
 #define KEY_READ_ONLY           "read-only"
 #define KEY_REGISTER_TARGET     "register_target"
@@ -951,24 +919,22 @@ struct obd_ops {
         int (*o_unpackmd)(struct obd_export *exp,struct lov_stripe_md **mem_tgt,
                           struct lov_mds_md *disk_src, int disk_len);
        int (*o_create)(const struct lu_env *env, struct obd_export *exp,
-                       struct obdo *oa, struct obd_trans_info *oti);
+                       struct obdo *oa);
        int (*o_destroy)(const struct lu_env *env, struct obd_export *exp,
-                        struct obdo *oa, struct obd_trans_info *oti);
-        int (*o_setattr)(const struct lu_env *, struct obd_export *exp,
-                         struct obd_info *oinfo, struct obd_trans_info *oti);
+                        struct obdo *oa);
+       int (*o_setattr)(const struct lu_env *, struct obd_export *exp,
+                        struct obd_info *oinfo);
         int (*o_getattr)(const struct lu_env *env, struct obd_export *exp,
                          struct obd_info *oinfo);
-        int (*o_preprw)(const struct lu_env *env, int cmd,
-                        struct obd_export *exp, struct obdo *oa, int objcount,
-                        struct obd_ioobj *obj, struct niobuf_remote *remote,
-                       int *nr_pages, struct niobuf_local *local,
-                       struct obd_trans_info *oti);
-        int (*o_commitrw)(const struct lu_env *env, int cmd,
-                          struct obd_export *exp, struct obdo *oa,
-                          int objcount, struct obd_ioobj *obj,
-                          struct niobuf_remote *remote, int pages,
-                          struct niobuf_local *local,
-                          struct obd_trans_info *oti, int rc);
+       int (*o_preprw)(const struct lu_env *env, int cmd,
+                       struct obd_export *exp, struct obdo *oa, int objcount,
+                       struct obd_ioobj *obj, struct niobuf_remote *remote,
+                       int *nr_pages, struct niobuf_local *local);
+       int (*o_commitrw)(const struct lu_env *env, int cmd,
+                         struct obd_export *exp, struct obdo *oa,
+                         int objcount, struct obd_ioobj *obj,
+                         struct niobuf_remote *remote, int pages,
+                         struct niobuf_local *local, int rc);
         int (*o_init_export)(struct obd_export *exp);
         int (*o_destroy_export)(struct obd_export *exp);
 
@@ -1120,7 +1086,7 @@ struct md_ops {
        int (*m_getattr_name)(struct obd_export *, struct md_op_data *,
                              struct ptlrpc_request **);
 
-       int (*m_init_ea_size)(struct obd_export *, __u32, __u32, __u32, __u32);
+       int (*m_init_ea_size)(struct obd_export *, __u32, __u32);
 
        int (*m_get_lustre_md)(struct obd_export *, struct ptlrpc_request *,
                               struct obd_export *, struct obd_export *,