RETURN(rc);
}
-static struct portals_handle_ops export_handle_ops;
+static const char export_handle_owner[] = "export";
/* map connection to client */
struct obd_export *class_conn2export(struct lustre_handle *conn)
}
CDEBUG(D_INFO, "looking for export cookie %#llx\n", conn->cookie);
- export = class_handle2object(conn->cookie, &export_handle_ops);
+ export = class_handle2object(conn->cookie, export_handle_owner);
RETURN(export);
}
EXPORT_SYMBOL(class_conn2export);
if (exp != obd->obd_self_export)
class_decref(obd, "export", exp);
- OBD_FREE_RCU(exp, sizeof(*exp), &exp->exp_handle);
+ OBD_FREE_PRE(exp, sizeof(*exp), "rcu");
+ kfree_rcu(exp, exp_handle.h_rcu);
EXIT;
}
-static struct portals_handle_ops export_handle_ops = {
- .hop_free = NULL,
- .hop_type = "export",
-};
-
struct obd_export *class_export_get(struct obd_export *exp)
{
refcount_inc(&exp->exp_handle.h_ref);
spin_lock_init(&export->exp_uncommitted_replies_lock);
INIT_LIST_HEAD(&export->exp_uncommitted_replies);
INIT_LIST_HEAD(&export->exp_req_replay_queue);
- INIT_LIST_HEAD_RCU(&export->exp_handle.h_link);
+ INIT_HLIST_NODE(&export->exp_handle.h_link);
INIT_LIST_HEAD(&export->exp_hp_rpcs);
INIT_LIST_HEAD(&export->exp_reg_rpcs);
- class_handle_hash(&export->exp_handle, &export_handle_ops);
+ class_handle_hash(&export->exp_handle, export_handle_owner);
export->exp_last_request_time = ktime_get_real_seconds();
spin_lock_init(&export->exp_lock);
spin_lock_init(&export->exp_rpc_lock);
init_waitqueue_head(&imp->imp_recovery_waitq);
INIT_WORK(&imp->imp_zombie_work, obd_zombie_imp_cull);
- if (curr_pid_ns->child_reaper)
+ if (curr_pid_ns && curr_pid_ns->child_reaper)
imp->imp_sec_refpid = curr_pid_ns->child_reaper->pid;
else
imp->imp_sec_refpid = 1;
spin_unlock(&cli->cl_mod_rpcs_lock);
/* tag 0 is reserved for non-modify RPCs */
- CDEBUG(D_RPCTRACE, "%s: modify RPC slot %u is allocated"
- "opc %u, max %hu\n",
+ CDEBUG(D_RPCTRACE,
+ "%s: modify RPC slot %u is allocated opc %u, max %hu\n",
cli->cl_import->imp_obd->obd_name,
i + 1, opc, max);