const struct obd_uuid *uuid)
{
struct hsm_agent *ha;
- cfs_list_t *pos;
- cfs_list_for_each(pos, &cdt->cdt_agents) {
- ha = cfs_list_entry(pos, struct hsm_agent, ha_list);
+ list_for_each_entry(ha, &cdt->cdt_agents, ha_list) {
if (obd_uuid_equals(&ha->ha_uuid, uuid))
return ha;
}
GOTO(out_free, rc = -EEXIST);
}
- cfs_list_add_tail(&ha->ha_list, &cdt->cdt_agents);
+ list_add_tail(&ha->ha_list, &cdt->cdt_agents);
if (ha->ha_archive_cnt == 0)
CDEBUG(D_HSM, "agent %s registered for all archives\n",
out_free:
- if ((ha != NULL) && (ha->ha_archive_id != NULL))
+ if (ha != NULL && ha->ha_archive_id != NULL)
OBD_FREE(ha->ha_archive_id,
ha->ha_archive_cnt * sizeof(*ha->ha_archive_id));
if (ha != NULL)
ha = mdt_hsm_agent_lookup(cdt, uuid);
if (ha != NULL)
- cfs_list_del_init(&ha->ha_list);
+ list_del_init(&ha->ha_list);
up_write(&cdt->cdt_agent_lock);
int succ_rq, int fail_rq, int new_rq,
const struct obd_uuid *uuid)
{
- struct hsm_agent *ha, *tmp;
+ struct hsm_agent *ha;
int rc;
ENTRY;
down_read(&cdt->cdt_agent_lock);
- cfs_list_for_each_entry_safe(ha, tmp, &cdt->cdt_agents, ha_list) {
+ list_for_each_entry(ha, &cdt->cdt_agents, ha_list) {
if (obd_uuid_equals(&ha->ha_uuid, uuid)) {
- if ((succ_rq == 0) && (fail_rq == 0) && (new_rq == 0)) {
+ if (succ_rq == 0 && fail_rq == 0 && new_rq == 0) {
atomic_set(&ha->ha_success, 0);
atomic_set(&ha->ha_failure, 0);
atomic_set(&ha->ha_requests, 0);
struct obd_uuid *uuid)
{
int rc = -EAGAIN, i, load = -1;
- struct hsm_agent *ha, *tmp;
+ struct hsm_agent *ha;
ENTRY;
/* Choose an export to send a copytool req to */
down_read(&cdt->cdt_agent_lock);
- cfs_list_for_each_entry_safe(ha, tmp, &cdt->cdt_agents, ha_list) {
+ list_for_each_entry(ha, &cdt->cdt_agents, ha_list) {
for (i = 0; (i < ha->ha_archive_cnt) &&
(ha->ha_archive_id[i] != archive); i++) {
/* nothing to do, just skip unmatching records */
}
/* archive count == 0 means copy tool serves any backend */
- if ((ha->ha_archive_cnt != 0) && (i == ha->ha_archive_cnt))
+ if (ha->ha_archive_cnt != 0 && i == ha->ha_archive_cnt)
continue;
- if ((load == -1) ||
- (load > atomic_read(&ha->ha_requests))) {
+ if (load == -1 || load > atomic_read(&ha->ha_requests)) {
load = atomic_read(&ha->ha_requests);
*uuid = ha->ha_uuid;
rc = 0;
/* Check if request is still valid (cf file hsm flags) */
fail_request = false;
- hai = hai_zero(hal);
+ hai = hai_first(hal);
for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai)) {
if (hai->hai_action != HSMA_CANCEL) {
struct mdt_object *obj;
struct md_hsm hsm;
- obj = mdt_hsm_get_md_hsm(mti, &hai->hai_fid, &hsm,
- NULL);
- if (IS_ERR(obj) && (hai->hai_action == HSMA_REMOVE))
- continue;
+ obj = mdt_hsm_get_md_hsm(mti, &hai->hai_fid, &hsm);
+ if (!IS_ERR(obj) && obj != NULL) {
+ mdt_object_put(mti->mti_env, obj);
+ } else {
+ if (hai->hai_action == HSMA_REMOVE)
+ continue;
- if (IS_ERR(obj) && (PTR_ERR(obj) == -ENOENT)) {
- fail_request = true;
- rc = mdt_agent_record_update(mti->mti_env, mdt,
+ if (obj == NULL) {
+ fail_request = true;
+ rc = mdt_agent_record_update(
+ mti->mti_env, mdt,
&hai->hai_cookie,
1, ARS_FAILED);
- if (rc) {
- CERROR("%s: mdt_agent_record_update() "
- "failed, rc=%d, cannot update "
+ if (rc) {
+ CERROR(
+ "%s: mdt_agent_record_update() "
+ "failed, cannot update "
"status to %s for cookie "
LPX64": rc = %d\n",
- mdt_obd_name(mdt), rc,
+ mdt_obd_name(mdt),
agent_req_status2name(ARS_FAILED),
hai->hai_cookie, rc);
- GOTO(out_buf, rc);
+ GOTO(out_buf, rc);
+ }
+ continue;
}
- continue;
- }
- if (IS_ERR(obj))
GOTO(out_buf, rc = PTR_ERR(obj));
+ }
if (!mdt_hsm_is_action_compat(hai, hal->hal_archive_id,
hal->hal_flags, &hsm)) {
1, ARS_FAILED);
if (rc) {
CERROR("%s: mdt_agent_record_update() "
- "failed, rc=%d, cannot update "
+ "failed, cannot update "
"status to %s for cookie "
LPX64": rc = %d\n",
- mdt_obd_name(mdt), rc,
+ mdt_obd_name(mdt),
agent_req_status2name(ARS_FAILED),
hai->hai_cookie, rc);
GOTO(out_buf, rc);
* from a server (MDT) to a client (MDC), backwards of normal comms.
*/
exp = cfs_hash_lookup(mdt2obd_dev(mdt)->obd_uuid_hash, &uuid);
- if ((exp == NULL) || (exp->exp_disconnected)) {
+ if (exp == NULL || exp->exp_disconnected) {
/* This should clean up agents on evicted exports */
rc = -ENOENT;
CERROR("%s: agent uuid (%s) not found, unregistering:"
out:
if (rc != 0 && is_registered) {
/* in case of error, we have to unregister requests */
- hai = hai_zero(hal);
+ hai = hai_first(hal);
for (i = 0; i < hal->hal_count; i++, hai = hai_next(hai)) {
if (hai->hai_action == HSMA_CANCEL)
continue;
{
struct mdt_device *mdt = s->private;
struct coordinator *cdt = &mdt->mdt_coordinator;
- cfs_list_t *pos;
+ struct list_head *pos;
loff_t i;
ENTRY;
down_read(&cdt->cdt_agent_lock);
- if (cfs_list_empty(&cdt->cdt_agents))
+ if (list_empty(&cdt->cdt_agents))
RETURN(NULL);
if (*off == 0)
RETURN(SEQ_START_TOKEN);
i = 0;
- cfs_list_for_each(pos, &cdt->cdt_agents) {
+ list_for_each(pos, &cdt->cdt_agents) {
i++;
if (i >= *off)
RETURN(pos);
{
struct mdt_device *mdt = s->private;
struct coordinator *cdt = &mdt->mdt_coordinator;
- cfs_list_t *pos = v;
+ struct list_head *pos = v;
ENTRY;
if (pos == SEQ_START_TOKEN)
*/
static int mdt_hsm_agent_proc_show(struct seq_file *s, void *v)
{
- cfs_list_t *pos = v;
+ struct list_head *pos = v;
struct hsm_agent *ha;
int i;
ENTRY;
if (pos == SEQ_START_TOKEN)
RETURN(0);
- ha = cfs_list_entry(pos, struct hsm_agent, ha_list);
- seq_printf(s, "uuid=%s archive#=%d (", ha->ha_uuid.uuid,
- ha->ha_archive_cnt);
- if (ha->ha_archive_cnt == 0)
- seq_printf(s, "all");
- else
- for (i = 0; i < ha->ha_archive_cnt; i++)
- seq_printf(s, "%d ", ha->ha_archive_id[i]);
+ ha = list_entry(pos, struct hsm_agent, ha_list);
+ seq_printf(s, "uuid=%s archive_id=", ha->ha_uuid.uuid);
+ if (ha->ha_archive_cnt == 0) {
+ seq_printf(s, "ANY");
+ } else {
+ seq_printf(s, "%d", ha->ha_archive_id[0]);
+ for (i = 1; i < ha->ha_archive_cnt; i++)
+ seq_printf(s, ",%d", ha->ha_archive_id[i]);
+ }
- seq_printf(s, ") r=%d s=%d f=%d\n",
+ seq_printf(s, " requests=[current:%d ok:%d errors:%d]\n",
atomic_read(&ha->ha_requests),
atomic_read(&ha->ha_success),
atomic_read(&ha->ha_failure));
int rc;
ENTRY;
- if (LPROCFS_ENTRY_AND_CHECK(PDE(inode)))
- RETURN(-ENOENT);
+ if (LPROCFS_ENTRY_CHECK(PDE(inode)))
+ RETURN(-ENOENT);
rc = seq_open(file, &mdt_hsm_agent_proc_ops);
- if (rc) {
- LPROCFS_EXIT();
+ if (rc)
RETURN(rc);
- }
+
s = file->private_data;
s->private = PDE(inode)->data;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff