LU-473 llite: improve error for 2.x cli + 1.8 srv

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

diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index e24c644..198b10a 100644 (file)
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -100,6 +100,7 @@ char *obd_export_nid2str(struct obd_export *exp);
 
 int obd_export_evict_by_nid(struct obd_device *obd, const char *nid);
 int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid);
+int obd_connect_flags2str(char *page, int count, __u64 flags, char *sep);
 
 int obd_zombie_impexp_init(void);
 void obd_zombie_impexp_stop(void);
@@ -144,8 +145,8 @@ static inline void lprocfs_echo_init_vars(struct lprocfs_static_vars *lvars)
 
 /* Passed as data param to class_config_parse_llog */
 struct config_llog_instance {
-        char *              cfg_instance;
-        char *              cfg_obdname;
+        char               *cfg_obdname;
+        void               *cfg_instance;
         struct super_block *cfg_sb;
         struct obd_uuid     cfg_uuid;
         int                 cfg_last_idx; /* for partial llog processing */
@@ -619,6 +620,31 @@ static inline int obd_cleanup(struct obd_device *obd)
         RETURN(rc);
 }
 
+static inline void obd_cleanup_client_import(struct obd_device *obd)
+{
+        ENTRY;
+
+        /* If we set up but never connected, the
+           client import will not have been cleaned. */
+        cfs_down_write(&obd->u.cli.cl_sem);
+        if (obd->u.cli.cl_import) {
+                struct obd_import *imp;
+                imp = obd->u.cli.cl_import;
+                CDEBUG(D_CONFIG, "%s: client import never connected\n",
+                       obd->obd_name);
+                ptlrpc_invalidate_import(imp);
+                if (imp->imp_rq_pool) {
+                        ptlrpc_free_rq_pool(imp->imp_rq_pool);
+                        imp->imp_rq_pool = NULL;
+                }
+                class_destroy_import(imp);
+                obd->u.cli.cl_import = NULL;
+        }
+        cfs_up_write(&obd->u.cli.cl_sem);
+
+        EXIT;
+}
+
 static inline int
 obd_process_config(struct obd_device *obd, int datalen, void *data)
 {
@@ -920,11 +946,11 @@ static inline struct obd_uuid *obd_get_uuid(struct obd_export *exp)
 static inline int obd_connect(const struct lu_env *env,
                               struct obd_export **exp,struct obd_device *obd,
                               struct obd_uuid *cluuid,
-                              struct obd_connect_data *d,
+                              struct obd_connect_data *data,
                               void *localdata)
 {
         int rc;
-        __u64 ocf = d ? d->ocd_connect_flags : 0; /* for post-condition
+        __u64 ocf = data ? data->ocd_connect_flags : 0; /* for post-condition
                                                    * check */
         ENTRY;
 
@@ -932,10 +958,10 @@ static inline int obd_connect(const struct lu_env *env,
         OBD_CHECK_DT_OP(obd, connect, -EOPNOTSUPP);
         OBD_COUNTER_INCREMENT(obd, connect);
 
-        rc = OBP(obd, connect)(env, exp, obd, cluuid, d, localdata);
+        rc = OBP(obd, connect)(env, exp, obd, cluuid, data, localdata);
         /* check that only subset is granted */
-        LASSERT(ergo(d != NULL,
-                     (d->ocd_connect_flags & ocf) == d->ocd_connect_flags));
+        LASSERT(ergo(data != NULL, (data->ocd_connect_flags & ocf) ==
+                                    data->ocd_connect_flags));
         RETURN(rc);
 }