* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
#include "cmm_internal.h"
#include "mdc_internal.h"
-static struct lu_device_operations mdc_lu_ops;
+static const struct lu_device_operations mdc_lu_ops;
static inline int lu_device_is_mdc(struct lu_device *ld)
{
ld->ld_ops == &mdc_lu_ops);
}
-static struct md_device_operations mdc_md_ops = { 0 };
+static const struct md_device_operations mdc_md_ops = { 0 };
static int mdc_obd_update(struct obd_device *host,
struct obd_device *watched,
- enum obd_notify_event ev, void *owner)
+ enum obd_notify_event ev, void *owner, void *data)
{
struct mdc_device *mc = owner;
int rc = 0;
CDEBUG(D_INFO, "Update connect_flags: "LPX64"\n",
conn_data->ocd_connect_flags);
}
-
+
RETURN(rc);
}
/* MDC OBD is set up already and connected to the proper MDS
CERROR("target %s not set up\n", mdc->obd_name);
rc = -EINVAL;
} else {
- struct lustre_handle *conn = &desc->cl_conn;
struct obd_connect_data *ocd;
CDEBUG(D_CONFIG, "connect to %s(%s)\n",
ocd->ocd_ibits_known = MDS_INODELOCK_UPDATE;
ocd->ocd_connect_flags = OBD_CONNECT_VERSION |
OBD_CONNECT_ACL |
- OBD_CONNECT_LCL_CLIENT |
+ OBD_CONNECT_RMT_CLIENT |
OBD_CONNECT_MDS_CAPA |
- OBD_CONNECT_OSS_CAPA |
+ OBD_CONNECT_OSS_CAPA |
OBD_CONNECT_IBITS |
OBD_CONNECT_MDS_MDS |
OBD_CONNECT_FID |
- OBD_CONNECT_AT;
- rc = obd_connect(env, conn, mdc, &mdc->obd_uuid, ocd, NULL);
+ OBD_CONNECT_AT |
+ OBD_CONNECT_FULL20;
+ rc = obd_connect(env, &desc->cl_exp, mdc, &mdc->obd_uuid, ocd, NULL);
OBD_FREE_PTR(ocd);
if (rc) {
CERROR("target %s connect error %d\n",
mdc->obd_name, rc);
} else {
- desc->cl_exp = class_conn2export(conn);
/* set seq controller export for MDC0 if exists */
if (mc->mc_num == 0)
ms->ms_control_exp =
mdc->obd_upcall.onu_upcall = mdc_obd_update;
}
}
-
+
if (rc) {
obd_disconnect(desc->cl_exp);
desc->cl_exp = NULL;
mdc_obd->obd_force = mdt_obd->obd_force;
mdc_obd->obd_fail = 0;
}
-
+
rc = obd_fid_fini(desc->cl_exp);
if (rc)
CERROR("Fid fini error %d\n", rc);
RETURN(rc);
}
-static struct lu_device_operations mdc_lu_ops = {
- .ldo_object_alloc = mdc_object_alloc,
+static const struct lu_device_operations mdc_lu_ops = {
+ .ldo_object_alloc = mdc_object_alloc,
.ldo_process_config = mdc_process_config
};
int max_mdsize, int max_cookiesize)
{
struct obd_device *obd = class_exp2obd(mc->mc_desc.cl_exp);
-
+
obd->u.cli.cl_max_mds_easize = max_mdsize;
obd->u.cli.cl_max_mds_cookiesize = max_cookiesize;
}
-static int mdc_device_init(const struct lu_env *env, struct lu_device *ld,
+static int mdc_device_init(const struct lu_env *env, struct lu_device *ld,
const char *name, struct lu_device *next)
{
return 0;
} else {
md_device_init(&mc->mc_md_dev, ldt);
mc->mc_md_dev.md_ops = &mdc_md_ops;
- ld = mdc2lu_dev(mc);
+ ld = mdc2lu_dev(mc);
ld->ld_ops = &mdc_lu_ops;
- sema_init(&mc->mc_fid_sem, 1);
-
+ cfs_sema_init(&mc->mc_fid_sem, 1);
}
RETURN (ld);
{
struct mdc_device *mc = lu2mdc_dev(ld);
- LASSERTF(atomic_read(&ld->ld_ref) == 0,
- "Refcount = %i\n", atomic_read(&ld->ld_ref));
- LASSERT(list_empty(&mc->mc_linkage));
+ LASSERTF(cfs_atomic_read(&ld->ld_ref) == 0,
+ "Refcount = %i\n", cfs_atomic_read(&ld->ld_ref));
+ LASSERT(cfs_list_empty(&mc->mc_linkage));
md_device_fini(&mc->mc_md_dev);
OBD_FREE_PTR(mc);
return NULL;
.ldto_init = mdc_type_init,
.ldto_fini = mdc_type_fini,
+ .ldto_start = mdc_type_start,
+ .ldto_stop = mdc_type_stop,
+
.ldto_device_alloc = mdc_device_alloc,
.ldto_device_free = mdc_device_free,