if (type->typ_name && type->typ_procroot)
remove_proc_subtree(type->typ_name, proc_lustre_root);
#endif
- if (type->typ_md_ops)
- OBD_FREE_PTR(type->typ_md_ops);
- if (type->typ_dt_ops)
- OBD_FREE_PTR(type->typ_dt_ops);
-
OBD_FREE(type, sizeof(*type));
}
#define CLASS_MAX_NAME 1024
-int class_register_type(struct obd_ops *dt_ops, struct md_ops *md_ops,
+int class_register_type(const struct obd_ops *dt_ops,
+ const struct md_ops *md_ops,
bool enable_proc, struct lprocfs_vars *vars,
const char *name, struct lu_device_type *ldt)
{
#ifdef HAVE_SERVER_SUPPORT
dir_exist:
#endif /* HAVE_SERVER_SUPPORT */
- OBD_ALLOC_PTR(type->typ_dt_ops);
- OBD_ALLOC_PTR(type->typ_md_ops);
-
- if (type->typ_dt_ops == NULL ||
- type->typ_md_ops == NULL)
- GOTO (failed, rc = -ENOMEM);
- *(type->typ_dt_ops) = *dt_ops;
- /* md_ops is optional */
- if (md_ops)
- *(type->typ_md_ops) = *md_ops;
+ type->typ_dt_ops = dt_ops;
+ type->typ_md_ops = md_ops;
#ifdef HAVE_SERVER_SUPPORT
if (type->typ_sym_filter) {
atomic_read(&type->typ_refcnt));
/* This is a bad situation, let's make the best of it */
/* Remove ops, but leave the name for debugging */
- OBD_FREE_PTR(type->typ_dt_ops);
- OBD_FREE_PTR(type->typ_md_ops);
+ type->typ_dt_ops = NULL;
+ type->typ_md_ops = NULL;
GOTO(out_put, rc = -EBUSY);
}
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);
struct obd_uuid *cluuid, bool is_self)
{
struct obd_export *export;
- struct cfs_hash *hash = NULL;
int rc = 0;
ENTRY;
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_HLIST_NODE(&export->exp_uuid_hash);
INIT_HLIST_NODE(&export->exp_nid_hash);
INIT_HLIST_NODE(&export->exp_gen_hash);
spin_lock_init(&export->exp_bl_list_lock);
export->exp_client_uuid = *cluuid;
obd_init_export(export);
+ at_init(&export->exp_bl_lock_at, obd_timeout, 0);
+
+ spin_lock(&obd->obd_dev_lock);
if (!obd_uuid_equals(cluuid, &obd->obd_uuid)) {
- spin_lock(&obd->obd_dev_lock);
/* shouldn't happen, but might race */
if (obd->obd_stopping)
GOTO(exit_unlock, rc = -ENODEV);
- hash = cfs_hash_getref(obd->obd_uuid_hash);
- if (hash == NULL)
- GOTO(exit_unlock, rc = -ENODEV);
- spin_unlock(&obd->obd_dev_lock);
-
- rc = cfs_hash_add_unique(hash, cluuid, &export->exp_uuid_hash);
+ rc = obd_uuid_add(obd, export);
if (rc != 0) {
- LCONSOLE_WARN("%s: denying duplicate export for %s, %d\n",
+ LCONSOLE_WARN("%s: denying duplicate export for %s: rc = %d\n",
obd->obd_name, cluuid->uuid, rc);
- GOTO(exit_err, rc = -EALREADY);
+ GOTO(exit_unlock, rc = -EALREADY);
}
}
- at_init(&export->exp_bl_lock_at, obd_timeout, 0);
- spin_lock(&obd->obd_dev_lock);
- if (obd->obd_stopping) {
- if (hash)
- cfs_hash_del(hash, cluuid, &export->exp_uuid_hash);
- GOTO(exit_unlock, rc = -ESHUTDOWN);
- }
-
if (!is_self) {
class_incref(obd, "export", export);
list_add_tail(&export->exp_obd_chain_timed,
INIT_LIST_HEAD(&export->exp_obd_chain);
}
spin_unlock(&obd->obd_dev_lock);
- if (hash)
- cfs_hash_putref(hash);
RETURN(export);
exit_unlock:
spin_unlock(&obd->obd_dev_lock);
-exit_err:
- if (hash)
- cfs_hash_putref(hash);
class_handle_unhash(&export->exp_handle);
- LASSERT(hlist_unhashed(&export->exp_uuid_hash));
obd_destroy_export(export);
OBD_FREE_PTR(export);
return ERR_PTR(rc);
spin_lock(&exp->exp_obd->obd_dev_lock);
/* delete an uuid-export hashitem from hashtables */
- if (!hlist_unhashed(&exp->exp_uuid_hash))
- cfs_hash_del(exp->exp_obd->obd_uuid_hash,
- &exp->exp_client_uuid,
- &exp->exp_uuid_hash);
+ if (exp != exp->exp_obd->obd_self_export)
+ obd_uuid_del(exp->exp_obd, exp);
#ifdef HAVE_SERVER_SUPPORT
if (!hlist_unhashed(&exp->exp_gen_hash)) {
obd_zombie_import_add(imp);
}
- /* catch possible import put race */
- LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, LI_POISON);
EXIT;
}
EXPORT_SYMBOL(class_import_put);
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;
}
EXPORT_SYMBOL(obd_export_evict_by_nid);
+#ifdef HAVE_SERVER_SUPPORT
int obd_export_evict_by_uuid(struct obd_device *obd, const char *uuid)
{
- struct cfs_hash *uuid_hash;
struct obd_export *doomed_exp = NULL;
struct obd_uuid doomed_uuid;
int exports_evicted = 0;
spin_unlock(&obd->obd_dev_lock);
return exports_evicted;
}
- uuid_hash = obd->obd_uuid_hash;
- cfs_hash_getref(uuid_hash);
spin_unlock(&obd->obd_dev_lock);
obd_str2uuid(&doomed_uuid, uuid);
if (obd_uuid_equals(&doomed_uuid, &obd->obd_uuid)) {
CERROR("%s: can't evict myself\n", obd->obd_name);
- cfs_hash_putref(uuid_hash);
return exports_evicted;
}
- doomed_exp = cfs_hash_lookup(uuid_hash, &doomed_uuid);
-
+ doomed_exp = obd_uuid_lookup(obd, &doomed_uuid);
if (doomed_exp == NULL) {
CERROR("%s: can't disconnect %s: no exports found\n",
obd->obd_name, uuid);
obd->obd_name, doomed_exp->exp_client_uuid.uuid);
class_fail_export(doomed_exp);
class_export_put(doomed_exp);
+ obd_uuid_del(obd, doomed_exp);
exports_evicted++;
}
- cfs_hash_putref(uuid_hash);
return exports_evicted;
}
+#endif /* HAVE_SERVER_SUPPORT */
#if LUSTRE_TRACKS_LOCK_EXP_REFS
void (*class_export_dump_hook)(struct obd_export*) = NULL;
return avail;
}
-static inline bool obd_skip_mod_rpc_slot(const struct lookup_intent *it)
-{
- if (it != NULL &&
- (it->it_op == IT_GETATTR || it->it_op == IT_LOOKUP ||
- it->it_op == IT_READDIR ||
- (it->it_op == IT_LAYOUT && !(it->it_flags & MDS_FMODE_WRITE))))
- return true;
- return false;
-}
/* Get a modify RPC slot from the obd client @cli according
* to the kind of operation @opc that is going to be sent
* Returns the tag to be set in the request message. Tag 0
* is reserved for non-modifying requests.
*/
-__u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc,
- struct lookup_intent *it)
+__u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc)
{
bool close_req = false;
__u16 i, max;
- /* read-only metadata RPCs don't consume a slot on MDT
- * for reply reconstruction
- */
- if (obd_skip_mod_rpc_slot(it))
- return 0;
-
if (opc == MDS_CLOSE)
close_req = true;
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);
EXPORT_SYMBOL(obd_get_mod_rpc_slot);
/* Put a modify RPC slot from the obd client @cli according
- * to the kind of operation @opc that has been sent and the
- * intent @it of the operation if it applies.
+ * to the kind of operation @opc that has been sent.
*/
-void obd_put_mod_rpc_slot(struct client_obd *cli, __u32 opc,
- struct lookup_intent *it, __u16 tag)
+void obd_put_mod_rpc_slot(struct client_obd *cli, __u32 opc, __u16 tag)
{
bool close_req = false;
- if (obd_skip_mod_rpc_slot(it))
+ if (tag == 0)
return;
if (opc == MDS_CLOSE)
git://git.whamcloud.com / fs / lustre-release.git / blobdiff