LU-5710 all: second batch of corrected typos and grammar errors

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

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index 98c2c92..8ae6648 100644 (file)
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.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) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *

- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.

  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/


@@ -70,8 +70,13 @@ struct adaptive_timeout {
        spinlock_t      at_lock;
 };
 
        spinlock_t      at_lock;
 };
 

+enum lustre_at_flags {
+       LATF_SKIP       = 0x0,
+       LATF_STATS      = 0x1,
+};
+

 struct ptlrpc_at_array {
 struct ptlrpc_at_array {

-        cfs_list_t       *paa_reqs_array; /** array to hold requests */
+       struct list_head *paa_reqs_array; /** array to hold requests */

         __u32             paa_size;       /** the size of array */
         __u32             paa_count;      /** the total count of reqs */
         time_t            paa_deadline;   /** the earliest deadline of reqs */
         __u32             paa_size;       /** the size of array */
         __u32             paa_count;      /** the total count of reqs */
         time_t            paa_deadline;   /** the earliest deadline of reqs */


@@ -132,9 +137,9 @@ enum obd_import_event {
  * Definition of import connection structure
  */
 struct obd_import_conn {
  * Definition of import connection structure
  */
 struct obd_import_conn {

-        /** Item for linking connections together */
-        cfs_list_t                oic_item;
-        /** Pointer to actual PortalRPC connection */
+       /** Item for linking connections together */
+       struct list_head          oic_item;
+       /** Pointer to actual PortalRPC connection */

         struct ptlrpc_connection *oic_conn;
         /** uuid of remote side */
         struct obd_uuid           oic_uuid;
         struct ptlrpc_connection *oic_conn;
         /** uuid of remote side */
         struct obd_uuid           oic_uuid;


@@ -156,32 +161,43 @@ struct import_state_hist {
  * Imports are representing client-side view to remote target.
  */
 struct obd_import {
  * Imports are representing client-side view to remote target.
  */
 struct obd_import {

-        /** Local handle (== id) for this import. */
-        struct portals_handle     imp_handle;
-        /** Reference counter */
-        cfs_atomic_t              imp_refcount;
-        struct lustre_handle      imp_dlm_handle; /* client's ldlm export */
-        /** Currently active connection */
-        struct ptlrpc_connection *imp_connection;
+       /** Local handle (== id) for this import. */
+       struct portals_handle     imp_handle;
+       /** Reference counter */
+       atomic_t                  imp_refcount;
+       struct lustre_handle      imp_dlm_handle; /* client's ldlm export */
+       /** Currently active connection */
+       struct ptlrpc_connection *imp_connection;

         /** PortalRPC client structure for this import */
         struct ptlrpc_client     *imp_client;
         /** PortalRPC client structure for this import */
         struct ptlrpc_client     *imp_client;

-        /** List element for linking into pinger chain */
-        cfs_list_t                imp_pinger_chain;
-        /** List element for linking into chain for destruction */
-        cfs_list_t                imp_zombie_chain;
+       /** List element for linking into pinger chain */
+       struct list_head          imp_pinger_chain;
+       /** List element for linking into chain for destruction */
+       struct list_head          imp_zombie_chain;

 
         /**
          * Lists of requests that are retained for replay, waiting for a reply,
          * or waiting for recovery to complete, respectively.
          * @{
          */
 
         /**
          * Lists of requests that are retained for replay, waiting for a reply,
          * or waiting for recovery to complete, respectively.
          * @{
          */

-        cfs_list_t                imp_replay_list;
-        cfs_list_t                imp_sending_list;
-        cfs_list_t                imp_delayed_list;
+       struct list_head        imp_replay_list;
+       struct list_head        imp_sending_list;
+       struct list_head        imp_delayed_list;

         /** @} */
 
         /** @} */
 

-        /** obd device for this import */
-        struct obd_device        *imp_obd;
+       /**
+        * List of requests that are retained for committed open replay. Once
+        * open is committed, open replay request will be moved from the
+        * imp_replay_list into the imp_committed_list.
+        * The imp_replay_cursor is for accelerating searching during replay.
+        * @{
+        */
+       struct list_head        imp_committed_list;
+       struct list_head        *imp_replay_cursor;
+       /** @} */
+
+       /** obd device for this import */
+       struct obd_device       *imp_obd;

 
         /**
          * some seciruty-related fields
 
         /**
          * some seciruty-related fields


@@ -192,21 +208,23 @@ struct obd_import {
         cfs_time_t                imp_sec_expire;
         /** @} */
 
         cfs_time_t                imp_sec_expire;
         /** @} */
 

-        /** Wait queue for those who need to wait for recovery completion */
-        cfs_waitq_t               imp_recovery_waitq;
-
-        /** Number of requests currently in-flight */
-        cfs_atomic_t              imp_inflight;
-        /** Number of requests currently unregistering */
-        cfs_atomic_t              imp_unregistering;
-        /** Number of replay requests inflight */
-        cfs_atomic_t              imp_replay_inflight;
-        /** Number of currently happening import invalidations */
-        cfs_atomic_t              imp_inval_count;
-        /** Numbner of request timeouts */
-        cfs_atomic_t              imp_timeouts;
-        /** Current import state */
+       /** Wait queue for those who need to wait for recovery completion */
+       wait_queue_head_t         imp_recovery_waitq;
+
+       /** Number of requests currently in-flight */
+       atomic_t                  imp_inflight;
+       /** Number of requests currently unregistering */
+       atomic_t                  imp_unregistering;
+       /** Number of replay requests inflight */
+       atomic_t                  imp_replay_inflight;
+       /** Number of currently happening import invalidations */
+       atomic_t                  imp_inval_count;
+       /** Numbner of request timeouts */
+       atomic_t                  imp_timeouts;
+       /** Current import state */

         enum lustre_imp_state     imp_state;
         enum lustre_imp_state     imp_state;

+       /** Last replay state */
+       enum lustre_imp_state     imp_replay_state;

         /** History of import states */
         struct import_state_hist  imp_state_hist[IMP_STATE_HIST_LEN];
         int                       imp_state_hist_idx;
         /** History of import states */
         struct import_state_hist  imp_state_hist[IMP_STATE_HIST_LEN];
         int                       imp_state_hist_idx;


@@ -237,11 +255,11 @@ struct obd_import {
         struct lustre_handle      imp_remote_handle;
         /** When to perform next ping. time in jiffies. */
         cfs_time_t                imp_next_ping;
         struct lustre_handle      imp_remote_handle;
         /** When to perform next ping. time in jiffies. */
         cfs_time_t                imp_next_ping;

-        /** When we last succesfully connected. time in 64bit jiffies */
+       /** When we last successfully connected. time in 64bit jiffies */

         __u64                     imp_last_success_conn;
 
         /** List of all possible connection for import. */
         __u64                     imp_last_success_conn;
 
         /** List of all possible connection for import. */

-        cfs_list_t                imp_conn_list;
+       struct list_head        imp_conn_list;

         /**
          * Current connection. \a imp_connection is imp_conn_current->oic_conn
          */
         /**
          * Current connection. \a imp_connection is imp_conn_current->oic_conn
          */


@@ -278,8 +296,10 @@ struct obd_import {
                                  imp_resend_replay:1,
                                  /* disable normal recovery, for test only. */
                                  imp_no_pinger_recover:1,
                                  imp_resend_replay:1,
                                  /* disable normal recovery, for test only. */
                                  imp_no_pinger_recover:1,

+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(3, 0, 53, 0)

                                  /* need IR MNE swab */
                                  imp_need_mne_swab:1,
                                  /* need IR MNE swab */
                                  imp_need_mne_swab:1,

+#endif

                                  /* import must be reconnected instead of
                                   * chouse new connection */
                                  imp_force_reconnect:1,
                                  /* import must be reconnected instead of
                                   * chouse new connection */
                                  imp_force_reconnect:1,


@@ -299,28 +319,6 @@ struct obd_import {
         time_t                    imp_last_reply_time;    /* for health check */
 };
 
         time_t                    imp_last_reply_time;    /* for health check */
 };
 

-typedef void (*obd_import_callback)(struct obd_import *imp, void *closure,
-                                    int event, void *event_arg, void *cb_data);
-
-/**
- * Structure for import observer.
- * It is possible to register "observer" on an import and every time
- * something happens to an import (like connect/evict/disconnect)
- * obderver will get its callback called with event type
- */
-struct obd_import_observer {
-        cfs_list_t           oio_chain;
-        obd_import_callback  oio_cb;
-        void                *oio_cb_data;
-};
-
-void class_observe_import(struct obd_import *imp, obd_import_callback cb,
-                          void *cb_data);
-void class_unobserve_import(struct obd_import *imp, obd_import_callback cb,
-                            void *cb_data);
-void class_notify_import_observers(struct obd_import *imp, int event,
-                                   void *event_arg);
-

 /* import.c */
 static inline unsigned int at_est2timeout(unsigned int val)
 {
 /* import.c */
 static inline unsigned int at_est2timeout(unsigned int val)
 {


@@ -336,9 +334,11 @@ static inline unsigned int at_timeout2est(unsigned int val)
 }
 
 static inline void at_reset(struct adaptive_timeout *at, int val) {
 }
 
 static inline void at_reset(struct adaptive_timeout *at, int val) {

+       spin_lock(&at->at_lock);

         at->at_current = val;
         at->at_worst_ever = val;
         at->at_worst_time = cfs_time_current_sec();
         at->at_current = val;
         at->at_worst_ever = val;
         at->at_worst_time = cfs_time_current_sec();

+       spin_unlock(&at->at_lock);

 }
 static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
        memset(at, 0, sizeof(*at));
 }
 static inline void at_init(struct adaptive_timeout *at, int val, int flags) {
        memset(at, 0, sizeof(*at));