#include <lustre_ioctl.h>
#include <lustre_quota.h>
#include <lustre_lfsck.h>
+#include <lustre_nodemap.h>
/**
* Initialize OFD per-export statistics.
* \retval negative value on error
*/
static int ofd_export_stats_init(struct ofd_device *ofd,
- struct obd_export *exp, void *client_nid)
+ struct obd_export *exp,
+ lnet_nid_t *client_nid)
{
struct obd_device *obd = ofd_obd(ofd);
struct nid_stat *stats;
- int num_stats;
- int rc, newnid = 0;
-
+ int rc;
ENTRY;
LASSERT(obd->obd_uses_nid_stats);
/* Self-export gets no proc entry */
RETURN(0);
- rc = lprocfs_exp_setup(exp, client_nid, &newnid);
- if (rc) {
- /* Mask error for already created
- * /proc entries */
- if (rc == -EALREADY)
- rc = 0;
- RETURN(rc);
- }
-
- if (newnid == 0)
- RETURN(0);
+ rc = lprocfs_exp_setup(exp, client_nid);
+ if (rc != 0)
+ /* Mask error for already created /proc entries */
+ RETURN(rc == -EALREADY ? 0 : rc);
stats = exp->exp_nid_stats;
- LASSERT(stats != NULL);
-
- num_stats = NUM_OBD_STATS + LPROC_OFD_STATS_LAST;
-
- stats->nid_stats = lprocfs_alloc_stats(num_stats,
- LPROCFS_STATS_FLAG_NOPERCPU);
+ stats->nid_stats = lprocfs_alloc_stats(NUM_OBD_STATS +
+ LPROC_OFD_STATS_LAST,
+ LPROCFS_STATS_FLAG_NOPERCPU);
if (stats->nid_stats == NULL)
- return -ENOMEM;
+ RETURN(-ENOMEM);
lprocfs_init_ops_stats(LPROC_OFD_STATS_LAST, stats->nid_stats);
+
ofd_stats_counter_init(stats->nid_stats);
- rc = lprocfs_register_stats(stats->nid_proc, "stats",
- stats->nid_stats);
- if (rc)
- GOTO(clean, rc);
- rc = lprocfs_nid_ldlm_stats_init(stats);
- if (rc) {
+ rc = lprocfs_register_stats(stats->nid_proc, "stats", stats->nid_stats);
+ if (rc != 0) {
lprocfs_free_stats(&stats->nid_stats);
- GOTO(clean, rc);
+ GOTO(out, rc);
}
- RETURN(0);
-clean:
- return rc;
+ rc = lprocfs_nid_ldlm_stats_init(stats);
+ if (rc != 0)
+ GOTO(out, rc);
+
+out:
+ RETURN(rc);
}
/**
*/
static int ofd_obd_reconnect(const struct lu_env *env, struct obd_export *exp,
struct obd_device *obd, struct obd_uuid *cluuid,
- struct obd_connect_data *data, void *localdata)
+ struct obd_connect_data *data,
+ void *client_nid)
{
struct ofd_device *ofd;
int rc;
rc = ofd_parse_connect_data(env, exp, data, false);
if (rc == 0)
- ofd_export_stats_init(ofd, exp, localdata);
+ ofd_export_stats_init(ofd, exp, client_nid);
+
+ nodemap_add_member(*(lnet_nid_t *)client_nid, exp);
RETURN(rc);
}
struct ofd_device *ofd;
struct lustre_handle conn = { 0 };
int rc;
+ lnet_nid_t *client_nid;
ENTRY;
if (_exp == NULL || obd == NULL || cluuid == NULL)
if (rc)
GOTO(out, rc);
+ if (localdata != NULL) {
+ client_nid = localdata;
+ nodemap_add_member(*client_nid, exp);
+ }
+
if (obd->obd_replayable) {
struct tg_export_data *ted = &exp->exp_target_data;
out:
if (rc != 0) {
+ nodemap_del_member(exp);
class_disconnect(exp);
*_exp = NULL;
} else {
if (!(exp->exp_flags & OBD_OPT_FORCE))
ofd_grant_sanity_check(ofd_obd(ofd), __FUNCTION__);
+ nodemap_del_member(exp);
rc = server_disconnect_export(exp);
ofd_grant_discard(exp);
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_obd_postrecov(struct obd_device *obd)
+static int ofd_obd_postrecov(struct obd_device *obd)
{
struct lu_env env;
struct lu_device *ldev = obd->obd_lu_dev;
* \param[in] key key name
* \param[out] vallen length of key value
* \param[out] val the key value to return
- * \param[in] lsm not used in OFD
*
* \retval 0 if successful
* \retval negative value on error
*/
static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
- __u32 keylen, void *key, __u32 *vallen, void *val,
- struct lov_stripe_md *lsm)
+ __u32 keylen, void *key, __u32 *vallen, void *val)
{
struct ofd_thread_info *info;
struct ofd_device *ofd;
struct ll_fiemap_info_key *fm_key = key;
- struct ll_user_fiemap *fiemap = val;
+ struct fiemap *fiemap = val;
int rc = 0;
ENTRY;
if (KEY_IS(KEY_FIEMAP)) {
info = ofd_info_init(env, exp);
- rc = ostid_to_fid(&info->fti_fid, &fm_key->oa.o_oi,
+ rc = ostid_to_fid(&info->fti_fid, &fm_key->lfik_oa.o_oi,
ofd->ofd_lut.lut_lsd.lsd_osd_index);
if (rc != 0)
RETURN(rc);
int rc = 0;
ENTRY;
- down_read(&ofd->ofd_lastid_rwsem);
- /* Currently, for safe, we do not distinguish which LAST_ID is broken,
- * we may do that in the future.
- * Return -ENOSPC until the LAST_ID rebuilt. */
- if (unlikely(ofd->ofd_lastid_rebuilding))
- GOTO(out, rc = -ENOSPC);
-
spin_lock(&ofd->ofd_osfs_lock);
if (cfs_time_before_64(ofd->ofd_osfs_age, max_age) || max_age == 0) {
- obd_size unstable;
+ u64 unstable;
/* statfs data are too old, get up-to-date one.
* we must be cautious here since multiple threads might be
* w/o the ofd_osfs_lock. Those ones got added to
* the cached statfs data that we are about to crunch.
* Take them into account in the new statfs data */
- osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+ osfs->os_bavail -= min_t(u64, osfs->os_bavail,
unstable >> ofd->ofd_blockbits);
/* However, we don't really know if those writes got
* accounted in the statfs call, so tell
if (from_cache)
*from_cache = 1;
}
-
GOTO(out, rc);
out:
- up_read(&ofd->ofd_lastid_rwsem);
-
return rc;
}
osfs->os_bfree << ofd->ofd_blockbits,
osfs->os_bavail << ofd->ofd_blockbits);
- osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+ osfs->os_bavail -= min_t(u64, osfs->os_bavail,
((ofd->ofd_tot_dirty + ofd->ofd_tot_pending +
osfs->os_bsize - 1) >> ofd->ofd_blockbits));
struct filter_export_data *fed;
fed = &obd->obd_self_export->exp_filter_data;
- osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+ osfs->os_bavail -= min_t(u64, osfs->os_bavail,
fed->fed_grant >> ofd->ofd_blockbits);
}
* \param[in] env execution environment
* \param[in] exp OBD export of OFD device
- * \param[in] oinfo obd_info with setattr parameters
- * \param[in] oti not used in OFD
+ * \param[in] oa setattr parameters
*
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp,
- struct obd_info *oinfo, struct obd_trans_info *oti)
+static int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp,
+ struct obdo *oa)
{
struct ofd_thread_info *info;
struct ofd_device *ofd = ofd_exp(exp);
struct ldlm_namespace *ns = ofd->ofd_namespace;
struct ldlm_resource *res;
struct ofd_object *fo;
- struct obdo *oa = oinfo->oi_oa;
struct lu_fid *fid = &oa->o_oi.oi_fid;
struct filter_fid *ff = NULL;
int rc = 0;
/* This would be very bad - accidentally truncating a file when
* changing the time or similar - bug 12203. */
- if (oa->o_valid & OBD_MD_FLSIZE &&
- oinfo->oi_policy.l_extent.end != OBD_OBJECT_EOF) {
+ if (oa->o_valid & OBD_MD_FLSIZE) {
static char mdsinum[48];
if (oa->o_valid & OBD_MD_FLFID)
* \param[in] env execution environment
* \param[in] exp OBD export of OFD device
* \param[in] oa obdo structure with FID
- * \param[in] md not used in OFD
- * \param[in] oti not used in OFD
- * \param[in] md_exp not used in OFD
- * \param[in] capa not used in OFD
*
* Note: this is OBD API method which is common API for server OBDs and
* client OBDs. Thus some parameters used in client OBDs may not be used
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_echo_destroy(const struct lu_env *env, struct obd_export *exp,
- struct obdo *oa, struct lov_stripe_md *md,
- struct obd_trans_info *oti, struct obd_export *md_exp,
- void *capa)
+static int ofd_echo_destroy(const struct lu_env *env, struct obd_export *exp,
+ struct obdo *oa)
{
struct ofd_device *ofd = ofd_exp(exp);
struct lu_fid *fid = &oa->o_oi.oi_fid;
* \param[in] env execution environment
* \param[in] exp OBD export of OFD device
* \param[in] oa obdo structure with FID sequence to use
- * \param[out] ea contains object ID/SEQ to return
- * \param[in] oti not used in OFD
*
* Note: this is OBD API method which is common API for server OBDs and
* client OBDs. Thus some parameters used in client OBDs may not be used
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_echo_create(const struct lu_env *env, struct obd_export *exp,
- struct obdo *oa, struct lov_stripe_md **ea,
- struct obd_trans_info *oti)
+static int ofd_echo_create(const struct lu_env *env, struct obd_export *exp,
+ struct obdo *oa)
{
struct ofd_device *ofd = ofd_exp(exp);
struct ofd_thread_info *info;
- obd_seq seq = ostid_seq(&oa->o_oi);
+ u64 seq = ostid_seq(&oa->o_oi);
struct ofd_seq *oseq;
int rc = 0, diff = 1;
- obd_id next_id;
+ u64 next_id;
int count;
ENTRY;
ofd_grant_commit(env, ofd_obd(ofd)->obd_self_export, rc);
out:
mutex_unlock(&oseq->os_create_lock);
- if (rc == 0 && ea != NULL) {
- struct lov_stripe_md *lsm = *ea;
-
- lsm->lsm_oi = oa->o_oi;
- }
ofd_seq_put(env, oseq);
out_sem:
*
* \param[in] env execution environment
* \param[in] exp OBD export of OFD device
- * \param[in,out] oinfo contains FID of object to get attributes from and
+ * \param[in,out] oa contains FID of object to get attributes from and
* is used to return attributes back
*
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp,
- struct obd_info *oinfo)
+static int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp,
+ struct obdo *oa)
{
struct ofd_device *ofd = ofd_exp(exp);
struct ofd_thread_info *info;
- struct lu_fid *fid = &oinfo->oi_oa->o_oi.oi_fid;
+ struct lu_fid *fid = &oa->o_oi.oi_fid;
struct ofd_object *fo;
int rc = 0;
LASSERT(fo != NULL);
rc = ofd_attr_get(env, fo, &info->fti_attr);
- oinfo->oi_oa->o_valid = OBD_MD_FLID;
+ oa->o_valid = OBD_MD_FLID;
if (rc == 0) {
__u64 curr_version;
- obdo_from_la(oinfo->oi_oa, &info->fti_attr,
+ obdo_from_la(oa, &info->fti_attr,
OFD_VALID_FLAGS | LA_UID | LA_GID);
/* Store object version in reply */
curr_version = dt_version_get(env, ofd_object_child(fo));
if ((__s64)curr_version != -EOPNOTSUPP) {
- oinfo->oi_oa->o_valid |= OBD_MD_FLDATAVERSION;
- oinfo->oi_oa->o_data_version = curr_version;
+ oa->o_valid |= OBD_MD_FLDATAVERSION;
+ oa->o_data_version = curr_version;
}
}
* \retval 0 if successful
* \retval negative value on error
*/
-int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
- void *karg, void *uarg)
+static int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
+ void *karg, void *uarg)
{
struct lu_env env;
struct ofd_device *ofd = ofd_exp(exp);
switch (cmd) {
case OBD_IOC_ABORT_RECOVERY:
CERROR("%s: aborting recovery\n", obd->obd_name);
+ obd->obd_force_abort_recovery = 1;
target_stop_recovery_thread(obd);
break;
case OBD_IOC_SYNC:
rc = ofd_ioc_get_obj_version(&env, ofd, karg);
break;
default:
- CERROR("%s: not supported cmd = %d\n", obd->obd_name, cmd);
+ CERROR("%s: not supported cmd = %#x\n", obd->obd_name, cmd);
rc = -ENOTTY;
}